imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make 'srg' the target namespace of remapJar when Forge is enabled

Browse Source
This commit is contained in:
Juuxel
2020-07-30 16:15:23 +03:00
parent ed331990e7
commit bee5b389c4
4 changed files with 33 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View File

@@ -61,7 +61,6 @@ import net.fabricmc.loom.task.AbstractLoomTask;
import net.fabricmc.loom.task.RemapAllSourcesTask;
import net.fabricmc.loom.task.RemapJarTask;
import net.fabricmc.loom.task.RemapSourcesJarTask;
import net.fabricmc.loom.task.SrgRemapJarTask;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.DownloadUtil;
import net.fabricmc.loom.util.FabricApiExtension;
@@ -273,22 +272,16 @@ public class AbstractPlugin implements Plugin<Project> {
if (extension.remapMod) {
AbstractArchiveTask jarTask = (AbstractArchiveTask) project1.getTasks().getByName("jar");
RemapJarTask remapJarTask = (RemapJarTask) project1.getTasks().findByName("remapJar");
SrgRemapJarTask srgRemapJarTask = (SrgRemapJarTask) project1.getTasks().findByName("srgRemapJar");
assert remapJarTask != null;
assert srgRemapJarTask != null;
if (!remapJarTask.getInput().isPresent()) {
jarTask.setClassifier("dev");
remapJarTask.setClassifier("");
if (extension.isForge()) {
remapJarTask.setClassifier("official");
remapJarTask.getInput().set(jarTask.getArchivePath());
srgRemapJarTask.setClassifier("");
srgRemapJarTask.getInput().set(remapJarTask.getArchivePath());
srgRemapJarTask.getMappings().set(extension.getMcpConfigProvider().getSrg());
} else {
remapJarTask.setClassifier("");
remapJarTask.getToM().set("srg");
}
}
@@ -297,10 +290,8 @@ public class AbstractPlugin implements Plugin<Project> {
remapJarTask.getRemapAccessWidener().set(true);
project1.getArtifacts().add("archives", remapJarTask);
project1.getArtifacts().add("archives", srgRemapJarTask);
remapJarTask.dependsOn(jarTask);
project1.getTasks().getByName("build").dependsOn(remapJarTask);
project1.getTasks().getByName("build").dependsOn(srgRemapJarTask);
Map<Project, Set<Task>> taskMap = project.getAllTasks(true);