ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #209

Browse source
This commit is contained in:
Jason Penilla 2023-09-22 17:57:46 -07:00
parent 23d9406d2c
commit 157abbb72f
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paperweight-lib/src/main/kotlin/io/papermc/paperweight/util/project-util.kt
View file

@ -43,7 +43,7 @@ import org.gradle.plugins.ide.idea.model.IdeaModel
fun Project.setupServerProject(
parent: Project,
remappedJar: Provider<RegularFile>,
remappedJar: Provider<*>,
remappedJarSources: Any,
mcDevSourceDir: Path,
libsFile: Any,
@ -64,7 +64,7 @@ fun Project.setupServerProject(
val filterProjectDir by tasks.registering<FilterProjectDir> {
inputSrcDir.set(file("src/main/java"))
inputResourcesDir.set(file("src/main/resources"))
vanillaJar.set(remappedJar)
vanillaJar.set(parent.layout.file(parent.files(remappedJar).elements.map { it.single().asFile })) // unlink dependency on upstream clone task for patcher (hack); it's implicitly handled when we get upstream data
outputJar.set(parent.layout.cache.resolve(FINAL_FILTERED_REMAPPED_JAR))
}

2
paperweight-patcher/src/main/kotlin/io/papermc/paperweight/patcher/PaperweightPatcher.kt
View file

@ -169,7 +169,7 @@ class PaperweightPatcher : Plugin<Project> {
val (_, reobfJar) = serverProj.setupServerProject(
target,
upstreamData.map { it.remappedJar }.convertToFileProvider(target.layout, target.providers),
upstreamData.map { it.remappedJar },
upstreamData.map { it.decompiledJar },
patcher.mcDevSourceDir.path,
upstreamData.map { it.libFile },