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

Slightly clean up ModProcessor and SourceRemapper

Browse Source
This commit is contained in:
Juuz
2023-01-08 22:20:01 +02:00
parent bb904a5a5d
commit 93d3b4c1bd
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/fabricmc/loom/util/SourceRemapper.java
View File

@@ -58,8 +58,8 @@ public class SourceRemapper {
private Mercury mercury;
public SourceRemapper(Project project, boolean named) {
this(project, named ? IntermediaryNamespaces.intermediary(project) : "named", !named ? IntermediaryNamespaces.intermediary(project) : "named");
public SourceRemapper(Project project, boolean toNamed) {
this(project, toNamed ? IntermediaryNamespaces.intermediary(project) : "named", !toNamed ? IntermediaryNamespaces.intermediary(project) : "named");
}
public SourceRemapper(Project project, String from, String to) {
@@ -68,13 +68,6 @@ public class SourceRemapper {
this.to = to;
}
public static void remapSources(Project project, File input, File output, String from, String to, boolean reproducibleFileOrder, boolean preserveFileTimestamps) {
SourceRemapper sourceRemapper = new SourceRemapper(project, from, to);
sourceRemapper.scheduleRemapSources(input, output, reproducibleFileOrder, preserveFileTimestamps, () -> {
});
sourceRemapper.remapAll();
}
public void scheduleRemapSources(File source, File destination, boolean reproducibleFileOrder, boolean preserveFileTimestamps, Runnable completionCallback) {
remapTasks.add((logger) -> {
try {
@@ -174,7 +167,7 @@ public class SourceRemapper {
LoomGradleExtension extension = LoomGradleExtension.get(project);
MappingsProviderImpl mappingsProvider = extension.getMappingsProvider();
String intermediary = extension.isForge() ? "srg" : "intermediary";
String intermediary = IntermediaryNamespaces.intermediary(project);
int id = -1;
if (from.equals(intermediary) && to.equals("named")) {