Skip to content

Commit 50821de

Browse files
liachLexManos
authored andcommitted
Set mappings for reobf extension to MCP->SRG to default (#616)
Fixes #615
1 parent e728804 commit 50821de

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

src/userdev/java/net/minecraftforge/gradle/userdev/UserDevPlugin.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ public RenameJarInPlace create(String jarName) {
7474
final RenameJarInPlace task = project.getTasks().maybeCreate("reobf" + name, RenameJarInPlace.class);
7575
task.setClasspath(java.getSourceSets().getByName("main").getCompileClasspath());
7676

77+
final Task createMcpToSrg = project.getTasks().findByName("createMcpToSrg");
78+
if (createMcpToSrg != null) {
79+
task.setMappings(() -> createMcpToSrg.getOutputs().getFiles().getSingleFile());
80+
}
81+
7782
project.getTasks().getByName("assemble").dependsOn(task);
7883

7984
// do after-Evaluate resolution, for the same of good error reporting
@@ -83,6 +88,10 @@ public RenameJarInPlace create(String jarName) {
8388
throw new IllegalStateException(jarName + " is not a jar task. Can only reobf jars!");
8489
task.setInput(((Jar) jar).getArchivePath());
8590
task.dependsOn(jar);
91+
92+
if (createMcpToSrg != null && task.getMappings().equals(createMcpToSrg.getOutputs().getFiles().getSingleFile())) {
93+
task.dependsOn(createMcpToSrg); // Add needed dependency if uses default mappings
94+
}
8695
});
8796

8897
return task;

0 commit comments

Comments
 (0)