From dd696172725276a969d985f5207235cf8ec9b89b Mon Sep 17 00:00:00 2001
From: Madeline Miller <mnmiller1@me.com>
Date: Thu, 17 Mar 2022 16:14:34 +1000
Subject: [PATCH] Make some improvements to the Forge side - still not fixed

---
 worldedit-forge/build.gradle.kts | 9 ++++++---
 worldedit-mod/build.gradle.kts   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts
index f2d3abfcf..893408114 100644
--- a/worldedit-forge/build.gradle.kts
+++ b/worldedit-forge/build.gradle.kts
@@ -57,8 +57,8 @@
 }
 
 configure<org.spongepowered.asm.gradle.plugins.MixinExtension> {
-    add(sourceSets["main"], "worldedit.mixins.refmap.json")
-    config("worldedit.mixins.json")
+    add(sourceSets["main"], "worldedit-forge.mixins.refmap.json")
+    config("worldedit-forge.mixins.json")
 }
 
 configure<BasePluginConvention> {
@@ -167,5 +167,8 @@
 
 afterEvaluate {
     val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
-    reobf.create("shadowJar")
+    reobf.create("shadowJar") {
+        dependsOn(tasks["createMcpToSrg"])
+        mappings.set(tasks["createMcpToSrg"].outputs.files.singleFile)
+    }
 }
diff --git a/worldedit-mod/build.gradle.kts b/worldedit-mod/build.gradle.kts
index 76fdd8dbd..66fa8cd67 100644
--- a/worldedit-mod/build.gradle.kts
+++ b/worldedit-mod/build.gradle.kts
@@ -15,7 +15,7 @@
     from(zipTree({remapFabric.get().archiveFile}))
     from(zipTree({project(":worldedit-forge").tasks.getByName("shadowJar").outputs.files.singleFile}))
 
-    duplicatesStrategy = DuplicatesStrategy.WARN
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     archiveClassifier.set("dist")
 }