diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-01-07 01:01:49 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-01-07 01:01:49 +0800 |
| commit | e472bd84ec86cdccfa7d536b1f34c065ed8ee09a (patch) | |
| tree | f796b31fd16b75fe8bf5cdd69580208259ed36ee /src/main | |
| parent | c9b952b9acf457b46a18dc9ec3b989b1ea512f6d (diff) | |
| download | architectury-loom-e472bd84ec86cdccfa7d536b1f34c065ed8ee09a.tar.gz architectury-loom-e472bd84ec86cdccfa7d536b1f34c065ed8ee09a.tar.bz2 architectury-loom-e472bd84ec86cdccfa7d536b1f34c065ed8ee09a.zip | |
Delete jar if failed to remap
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java index 22cce693..2e496a1f 100644 --- a/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/MinecraftMappedProvider.java @@ -150,6 +150,7 @@ public class MinecraftMappedProvider extends DependencyProvider { remapper.readInputs(input); remapper.apply(outputConsumer); } catch (Exception e) { + Files.deleteIfExists(output); throw new RuntimeException("Failed to remap JAR " + input + " with mappings from " + mappingsProvider.tinyMappings, e); } finally { remapper.finish(); @@ -204,6 +205,7 @@ public class MinecraftMappedProvider extends DependencyProvider { TinyRemapper.Builder builder = TinyRemapper.newRemapper() .withMappings(TinyRemapperMappingsHelper.create(getExtension().isForge() ? getExtension().getMappingsProvider().getMappingsWithSrg() : getExtension().getMappingsProvider().getMappings(), fromM, toM, true)) .renameInvalidLocals(true) + .ignoreConflicts(getExtension().isForge()) .rebuildSourceFilenames(true); if (getExtension().isForge()) { |