From cd1d19afa7857bc95bdeab474ab6357c312b55c0 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 4 Apr 2021 21:54:07 +0800 Subject: [PATCH] Update tiny remapper --- build.gradle | 5 +++-- .../providers/minecraft/MinecraftMappedProvider.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 418c738e..279d7332 100644 --- a/build.gradle +++ b/build.gradle @@ -72,8 +72,8 @@ dependencies { } // tinyfile management - compileOnly ('net.fabricmc:tiny-remapper:0.3.2-architectury.6') - shadowArchitectury ('net.fabricmc:tiny-remapper:0.3.2-architectury.6') { + compileOnly ('net.fabricmc:tiny-remapper:0.3.2-architectury.7') + shadowArchitectury ('net.fabricmc:tiny-remapper:0.3.2-architectury.7') { transitive = false } implementation ('net.fabricmc:tiny-mappings-parser:0.3.0+build.17') @@ -139,6 +139,7 @@ jar { shadowJar { relocate "net.fabricmc.tinyremapper", "me.shedaniel.architectury.loom.shadowed.impl.net.fabricmc.tinyremapper" relocate "me.shedaniel.architectury.refmapremapper", "me.shedaniel.architectury.loom.shadowed.impl.me.shedaniel.architectury.refmapremapper" + relocate "org.objectweb.asm", "me.shedaniel.architectury.loom.shadowed.impl.org.objectweb.asm" configurations = [project.configurations.shadowArchitectury] classifier "shadow" } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java index 3b2e9391..b3d46b7f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java @@ -117,6 +117,7 @@ public class MinecraftMappedProvider extends DependencyProvider { if (getExtension().isForge()) { minecraftSrgJar.delete(); } + getExtension().getMappingsProvider().cleanFiles(); throw new RuntimeException("Failed to remap minecraft", t); }