Add 26.1 implementation for forge

Author: TBlueF

gradle/libs.versions.toml

@@ -38,8 +38,9 @@ lz4 = { module = "at.yawk.lz4:lz4-java", version = "1.8.1" }
 
 [plugins]
 cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.4.0" }
-forgegradle = { id = "net.minecraftforge.gradle", version = "[6.0.24,6.2)" }
+forgegradle = { id = "net.minecraftforge.gradle", version = "[7.0.17,8)" }
 hangar = { id = "io.papermc.hangar-publish-plugin", version = "0.1.2" }
+jarjar = { id = "net.minecraftforge.jarjar", version = "0.2.3" }
 loom = { id = "net.fabricmc.fabric-loom", version = "1.15-SNAPSHOT" }
 minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
 node-gradle = { id = "com.github.node-gradle.node", version = "7.0.2" }

implementations/forge/build.gradle.kts

@@ -3,26 +3,34 @@ plugins {
     bluemap.modrinth
     bluemap.curseforge
     alias ( libs.plugins.forgegradle )
+    alias ( libs.plugins.jarjar )
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.11"
+    "26.1"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val forgeVersion = "61.0.0"
+val forgeVersion = "62.0.1"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)
-jarJar.enable()
+jarJar.register();
+
+repositories {
+    minecraft.mavenizer(this)
+    maven(fg.forgeMaven)
+    maven(fg.minecraftLibsMaven)
+}
 
 dependencies {
 
     shadowInclude ( project( ":common" ) ) {
         exclude ( group = "com.google.code.gson", module = "gson" )
     }
 
-    minecraft ( "net.minecraftforge", "forge", "$minecraftVersion-$forgeVersion" )
+    implementation ( minecraft.dependency("net.minecraftforge:forge:$minecraftVersion-$forgeVersion") )
+    annotationProcessor ( "net.minecraftforge:eventbus-validator:7.0.1" )
 
     shadowInclude ( libs.bluecommands.brigadier ) {
         exclude ( group = "com.mojang", module = "brigadier" )
@@ -31,14 +39,13 @@ dependencies {
         exclude ( group = "com.google.code.gson", module = "gson" )
     }
 
-    jarJar ( "${libs.flow.math.get().group}:${libs.flow.math.get().name}:[${libs.flow.math.get().version},)" )
-    jarJar ( "${libs.bluenbt.get().group}:${libs.bluenbt.get().name}:[${libs.bluenbt.get().version},)" )
+    "jarJar" ( libs.flow.math )
+    "jarJar" ( libs.bluenbt )
 
 }
 
 minecraft {
     mappings( "official", minecraftVersion )
-    reobf = false
 }
 
 tasks.shadowJar {
@@ -77,10 +84,6 @@ tasks.shadowJar {
 
 }
 
-tasks.jarJar.configure {
-    archiveFileName = "${project.name}-${project.version}-jarjar.jar"
-}
-
 tasks.withType(ProcessResources::class).configureEach {
     val replacements = mapOf(
         "version" to project.version,
@@ -94,11 +97,15 @@ tasks.withType(ProcessResources::class).configureEach {
     )) { expand(replacements) }
 }
 
-val mergeShadowAndJarJar = tasks.create<Jar>("mergeShadowAndJarJar") {
-    dependsOn( tasks.shadowJar, tasks.jarJar )
+val jarJarTask = tasks.named<Jar>("jarJar") {
+    archiveFileName = "${project.name}-${project.version}-jarjar.jar"
+}
+
+val mergeShadowAndJarJar = tasks.register<Jar>("mergeShadowAndJarJar") {
+    dependsOn( tasks.shadowJar, jarJarTask )
     from (
         zipTree( tasks.shadowJar.map { it.outputs.files.singleFile } ),
-        zipTree( tasks.jarJar.map { it.outputs.files.singleFile } ).matching {
+        zipTree( jarJarTask.map { it.outputs.files.singleFile } ).matching {
             include("META-INF/jarjar/**")
         }
     ).exclude(
@@ -109,7 +116,7 @@ val mergeShadowAndJarJar = tasks.create<Jar>("mergeShadowAndJarJar") {
 
 tasks.getByName<CopyFileTask>("release") {
     dependsOn( mergeShadowAndJarJar )
-    inputFile = mergeShadowAndJarJar.outputs.files.singleFile
+    inputFile = mergeShadowAndJarJar.get().outputs.files.singleFile
 }
 
 modrinth {

settings.gradle.kts

@@ -24,7 +24,7 @@ include(":common")
 
 implementation("cli")
 implementation("fabric")
-//implementation("forge")
+implementation("forge")
 implementation("neoforge")
 implementation("paper")
 implementation("spigot")