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

Merge remote-tracking branch 'architectury/dev/0.6-forge' into dev/0.7-forge

Browse Source
This commit is contained in:
shedaniel
2021-04-17 22:37:03 +08:00
parent aa009c2b2d 8f6de9af84
commit b200c4ff62
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/fabricmc/loom/build/JarRemapper.java
View File

@@ -81,7 +81,7 @@ public class JarRemapper {
Path[] remapClasspath = classPath.stream()
.filter(path ->
remapData.stream().noneMatch(remapData -> remapData.input.equals(path))
remapData.stream().noneMatch(remapData -> remapData.input.toString().equals(path.toString()))
)
.toArray(Path[]::new);
@@ -90,13 +90,27 @@ public class JarRemapper {
for (RemapData data : remapData) {
InputTag tag = remapper.createInputTag();
data.tag = tag;
remapper.readInputsAsync(tag, data.input);
project.getLogger().info(":remapper input -> " + data.input.getFileName().toString());
try {
remapper.readInputsAsync(tag, data.input);
} catch (Exception e) {
throw new RuntimeException("Failed to read remapper input " + data.input.getFileName().toString(), e);
}
}
List<OutputConsumerPath> outputConsumers = new ArrayList<>();
for (RemapData data : remapData) {
OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(data.output).build();
OutputConsumerPath outputConsumer;
project.getLogger().info(":remapper output -> " + data.output.getFileName().toString());
try {
outputConsumer = new OutputConsumerPath.Builder(data.output).build();
} catch (Exception e) {
throw new RuntimeException("Failed to create remapper output " + data.output.getFileName().toString(), e);
}
outputConsumers.add(outputConsumer);
outputConsumer.addNonClassFiles(data.input);