From 8ce84e39e238ec117996d96cfbbe2f6a9cb31c78 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <jonas@spark-squared.com>
Date: Thu, 2 Apr 2020 01:59:32 +0200
Subject: [PATCH] Fix shadowJar task using incorrect jar with loom

---
 versions/common.gradle | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/versions/common.gradle b/versions/common.gradle
index 9feebcad..841d55ee 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -273,6 +273,7 @@ dependencies {
 
     shadow "com.github.ReplayMod:ReplayStudio:ce5876d", shadeExclusions
 
+    project.evaluationDependsOn(":jGui:$jGuiVersion")
     shadowReobf(project(":jGui:$jGuiVersion")){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
         exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
@@ -310,6 +311,14 @@ if (mcVersion <= 10710) {
     }
 }
 
+if (FABRIC) {
+    tasks.remapJar {
+        afterEvaluate { // FIXME why does loom overwrite this if we set it immediately?
+            archiveClassifier.set('obf')
+        }
+    }
+}
+
 task configureRelocation() {
     dependsOn tasks.jar
     dependsOn configurations.relocate
@@ -367,7 +376,7 @@ task configureRelocation() {
 
 tasks.removeByName('shadowJar') // we want to base our shadowed jar on the reobfJar output, not the sourceSet output
 task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
-    from({ zipTree(tasks.jar.archivePath) }) {
+    from({ zipTree((FABRIC ? tasks.remapJar : tasks.jar).archiveFile.get()) }) {
         filesMatching('mixins.jgui.json') {
             filter { it.replace('de.johni0702', 'com.replaymod.lib.de.johni0702') }
         }
@@ -375,7 +384,7 @@ task shadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar)
             filter { it.replace('de/johni0702', 'com/replaymod/lib/de/johni0702') }
         }
     }
-    afterEvaluate { dependsOn FABRIC ? tasks.remapJar : (mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf) }
+    dependsOn { FABRIC ? tasks.remapJar : (mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf) }
     manifest.inheritFrom tasks.jar.manifest
 
     from project.configurations.shade