From e86f37fdfb00cf8684a5ad1e1477415836a8ea0f Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Fri, 14 May 2021 22:30:27 -0700
Subject: [PATCH] Forge build hacks

---
 platforms/forge/build.gradle.kts | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/platforms/forge/build.gradle.kts b/platforms/forge/build.gradle.kts
index 21cc70b1f..682981977 100644
--- a/platforms/forge/build.gradle.kts
+++ b/platforms/forge/build.gradle.kts
@@ -1,6 +1,6 @@
 import com.dfsek.terra.configureCommon
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.minecraftforge.gradle.common.util.RunConfig
-import net.minecraftforge.gradle.mcp.task.GenerateSRG
 import net.minecraftforge.gradle.userdev.UserDevExtension
 import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
 
@@ -55,11 +55,17 @@ if ("true" == System.getProperty("idea.sync.active")) {
     }
 }
 
+
+tasks.named<ShadowJar>("shadowJar") {
+    archiveBaseName.set(tasks.getByName<Jar>("jar").archiveBaseName.orNull) // Pain. Agony, even.
+    archiveClassifier.set("") // Suffering, if you will.
+}
+
 afterEvaluate {
-    val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
-    reobf.maybeCreate("shadowJar").run {
-        group = "forge"
-        mappings = tasks.getByName<GenerateSRG>("createMcpToSrg").output
+    tasks.named<RenameJarInPlace>("reobfJar") {
+        val shadow = tasks.getByName<ShadowJar>("shadowJar");
+        dependsOn(shadow)
+        input = shadow.archiveFile.orNull?.asFile
     }
 }
 
@@ -124,12 +130,12 @@ tasks.jar {
 }
 
 tasks.register<com.modrinth.minotaur.TaskModrinthUpload>("publishModrinthForge") {
-    dependsOn("reobfShadowJar")
+    dependsOn("reobfJar")
     group = "forge"
     token = System.getenv("MODRINTH_SECRET")
     projectId = "FIlZB9L0"
     versionNumber = "${project.version}-forge"
-    uploadFile = tasks.named<RenameJarInPlace>("reobfShadowJar").get().input.absoluteFile
+    uploadFile = tasks.named<RenameJarInPlace>("reobfJar").get().input.absoluteFile
     releaseType = "alpha"
     addGameVersion("1.16.5")
     addLoader("forge")