Skip to content

Commit

Permalink
add missing .get().getAsFile()s to fix genFakeSource and decompileVin…
Browse files Browse the repository at this point in the history
…eflower

temporarily make remapTargetMinecraftJar directly depend on unpickTargetJar, shouldn't be necessary once CheckTargetVersionExists and CheckUnpickVersionsMatchTask are converted to BuildService's
add more TODOs to build.gradle
  • Loading branch information
supersaiyansubtlety committed Oct 4, 2024
1 parent 243fa36 commit f830291
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
name "Fabric Repository"
url 'https://maven.fabricmc.net'
}
// remove when ASM fix is released
// TODO remove when ASM fix is released
maven {
url = "https://repository.ow2.org/nexus/content/repositories/snapshots/"
}
Expand Down Expand Up @@ -69,13 +69,14 @@ repositories {
name "Quilt Snapshot Repository"
url "https://maven.quiltmc.org/repository/snapshot"
}
// remove when ASM fix is released
// TODO remove when ASM fix is released
maven {
url = "https://repository.ow2.org/nexus/content/repositories/snapshots/"
}
mavenLocal()
}

// TODO move at least some of these to MappingsPlugin
configurations {
enigmaRuntime
javadocClasspath
Expand Down Expand Up @@ -113,18 +114,16 @@ import quilt.internal.tasks.unpick.RemapUnpickDefinitionsTask
import quilt.internal.tasks.unpick.UnpickJarTask
import quilt.internal.util.MappingsJavadocProvider

// TODO consider moving cleanable things to build/ so this isn't necessary,
// or put them in .gradle/cleanable/ and only add that here (or MappingsPlugin)
clean.doFirst {
delete mappings.fileConstants.tempDir, mappings.fileConstants.cacheFilesMinecraft,
mappings.fileConstants.unpickGlDefinitions, mappings.fileConstants.unpickGlStateManagerDefinitions
}

tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"

// task insertAutoGeneratedMappings(dependsOn: [buildMappingsTiny, downloadPerVersionMappings], type: AddProposedMappingsTask) {
// inputJar.set mappings.fileConstants.perVersionMappingsJar
// inputMappings.set buildMappingsTiny.outputMappings
// }

// TODO move all custom tasks and their configuration to MappingsPlugin
combineUnpickDefinitions {
input = mappings.fileConstants.unpickDefinitions
output = new File(mappings.fileConstants.buildDir, 'definitions.unpick')
Expand Down Expand Up @@ -286,7 +285,7 @@ task genFakeSource(type: DecompileTask, dependsOn: [mergeTinyV2, eraseBytecode])
doFirst {
fakeSourceDir.deleteDir()

def jdProvider = new MappingsJavadocProvider(mergeTinyV2.outputMappings, "named")
def jdProvider = new MappingsJavadocProvider(mergeTinyV2.outputMappings.get().getAsFile(), "named")
classJavadocProvider(jdProvider)
fieldJavadocProvider(jdProvider)
methodJavadocProvider(jdProvider)
Expand All @@ -305,7 +304,8 @@ task decompileVineflower(type: DecompileTask, dependsOn: [mapNamedJar]) {
doFirst {
file("namedSrc").deleteDir()

def javadocProvider = new MappingsJavadocProvider(insertAutoGeneratedMappings.outputMappings, "named")
def javadocProvider =
new MappingsJavadocProvider(insertAutoGeneratedMappings.outputMappings.get().getAsFile(), "named")
classJavadocProvider(javadocProvider)
fieldJavadocProvider(javadocProvider)
methodJavadocProvider(javadocProvider)
Expand Down
4 changes: 4 additions & 0 deletions buildSrc/src/main/java/quilt/internal/MappingsPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@ public void apply(@NotNull Project project) {
final var remapTargetMinecraftJar = tasks.register(
RemapTargetMinecraftJarTask.TASK_NAME, RemapTargetMinecraftJarTask.class,
task -> {
// TODO temporary until CheckTargetVersionExists and CheckUnpickVersionsMatchTask
// are converted to BuildService's
task.dependsOn(unpickTargetJar);

task.getInputJar().convention(unpickTargetJar.flatMap(UnpickTargetJarTask::getOutputFile));

task.getMappingsFile().convention(
Expand Down

2 comments on commit f830291

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No difference between head and target.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No difference between head and target.

Please sign in to comment.