From db623157aa32a44e7d3923786da09b804c716ca9 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sun, 15 Nov 2020 16:03:16 +0000 Subject: [PATCH] Use Mercury 0.1.0-rc1 (#301) --- build.gradle | 4 ++-- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5ef1a36..af0cc43 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { implementation ('net.fabricmc:lorenz-tiny:2.0.0+build.2') { transitive = false } - implementation ('org.cadixdev:lorenz-io-proguard:0.5.3') + implementation ('org.cadixdev:lorenz-io-proguard:0.5.5') // decompilers implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.13') @@ -61,7 +61,7 @@ dependencies { implementation ('org.benf:cfr:0.150') // source code remapping - implementation ('org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT') + implementation ('org.cadixdev:mercury:0.1.0-rc1') // Kapt integration compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72') diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index faa48ca..1f901ae 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -212,6 +212,7 @@ public class SourceRemapper { public static Mercury createMercuryWithClassPath(Project project, boolean toNamed) { Mercury m = new Mercury(); + m.setGracefulClasspathChecks(true); for (File file : project.getConfigurations().getByName(Constants.Configurations.MINECRAFT_DEPENDENCIES).getFiles()) { m.getClassPath().add(file.toPath());