Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't add remapSourcesJar by default #115

Merged
merged 1 commit into from
Nov 17, 2024
Merged

don't add remapSourcesJar by default #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/api/kotlin/xyz/wagyourtail/unimined/api/minecraft/MinecraftConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)`
Expand Down
28 changes: 13 additions & 15 deletions src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Loading