don't add remapSourcesJar by default

unimined · Nov 16, 2024 · 5f16dbb · 5f16dbb
1 parent d400c2c
commit 5f16dbb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/MinecraftConfig.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/MinecraftConfig.kt
@@ -20,7 +20,6 @@ import xyz.wagyourtail.unimined.api.minecraft.resolver.MinecraftData
 import xyz.wagyourtail.unimined.api.mod.ModsConfig
 import xyz.wagyourtail.unimined.api.runs.RunsConfig
 import xyz.wagyourtail.unimined.api.source.SourceConfig
-import xyz.wagyourtail.unimined.api.minecraft.task.AbstractRemapJarTask
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask
 import xyz.wagyourtail.unimined.api.minecraft.task.RemapSourcesJarTask
 import xyz.wagyourtail.unimined.api.unimined
@@ -95,6 +94,11 @@ abstract class MinecraftConfig(val project: Project, val sourceSet: SourceSet) :
      */
     var defaultRemapJar: Boolean by FinalizeOnRead(true)
 
+    /**
+     * should unimined add the default "remapSourcesJar" task to this sourceSet?
+     */
+    var defaultRemapSourcesJar: Boolean by FinalizeOnRead(false)
+
     /**
      * if the jar task for defaultRemapJar doesn't exist, should unimined create it?
      * if so, it will be created with `from(this.sourceSet.output, sourceSets.main.output)`

diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -450,20 +450,6 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         }
     }
 
-    private fun applyDefaultRemapJars() {
-        applyDefaultRemapJar<RemapJarTaskImpl>("jar", ::remap) {
-            from(sourceSet.output)
-            archiveClassifier.set(sourceSet.name)
-            from(combinedWithList.map { it.second.output })
-        }
-
-        applyDefaultRemapJar<RemapSourcesJarTaskImpl>("sourcesJar", ::remapSources) {
-            from(sourceSet.allSource)
-            archiveClassifier.set("${sourceSet.name}-sources")
-            from(combinedWithList.map { it.second.allSource })
-        }
-    }
-
     private inline fun <reified T> applyDefaultRemapJar(
         inputTaskName: String,
         remappingFunction: (Task, JarInterface<AbstractRemapJarTask>.() -> Unit) -> Unit,
@@ -611,7 +597,19 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         if (mcPatcher.addVanillaLibraries) addLibraries(minecraftData.metadata.libraries)
 
         if (defaultRemapJar) {
-            applyDefaultRemapJars()
+            applyDefaultRemapJar<RemapJarTaskImpl>("jar", ::remap) {
+                from(sourceSet.output)
+                archiveClassifier.set(sourceSet.name)
+                from(combinedWithList.map { it.second.output })
+            }
+        }
+
+        if (defaultRemapSourcesJar) {
+            applyDefaultRemapJar<RemapSourcesJarTaskImpl>("sourcesJar", ::remapSources) {
+                from(sourceSet.allSource)
+                archiveClassifier.set("${sourceSet.name}-sources")
+                from(combinedWithList.map { it.second.allSource })
+            }
         }
 
         // apply minecraft patcher changes