From 458eaabb7ef302d1f5869bdd3e13e75679dbb49c Mon Sep 17 00:00:00 2001 From: Fudge Date: Mon, 11 Nov 2019 15:21:59 +0200 Subject: [PATCH] Fix V2 regressions (#146) * fix regressions * Supposedly fix kotlin compile error --- build.gradle | 8 +++----- src/main/java/net/fabricmc/loom/util/ModProcessor.java | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 89f8e5e..b92c14a 100644 --- a/build.gradle +++ b/build.gradle @@ -39,17 +39,15 @@ dependencies { implementation ('com.google.guava:guava:28.0-jre') // game handling utils - implementation ('net.fabricmc:stitch:0.3.0.66') { + implementation ('net.fabricmc:stitch:0.4.0.67') { exclude module: 'enigma' } // tinyfile management - implementation ('net.fabricmc:tiny-remapper:0.2.0.53') { + implementation ('net.fabricmc:tiny-remapper:0.2.0.56') { transitive = false } - implementation ('net.fabricmc:fabric-mixin-compile-extensions:0.2.0.3'){ - exclude group :"net.fabricmc" - } + implementation ('net.fabricmc:fabric-mixin-compile-extensions:0.2.0.3') // decompilers implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.+') diff --git a/src/main/java/net/fabricmc/loom/util/ModProcessor.java b/src/main/java/net/fabricmc/loom/util/ModProcessor.java index 09c746f..9557292 100644 --- a/src/main/java/net/fabricmc/loom/util/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/util/ModProcessor.java @@ -169,6 +169,7 @@ public class ModProcessor { TinyRemapper remapper = TinyRemapper.newRemapper() .withMappings(TinyRemapperMappingsHelper.create(mappingsProvider.getMappings(), fromM, toM, false)) + .renameInvalidLocals(true) .build(); try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(Paths.get(output.getAbsolutePath())).build()) {