hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use Mercury 0.1.0-rc1 (#301)

Browse source
This commit is contained in:
Jamie Mansfield 2020-11-15 16:03:16 +00:00 committed by GitHub
parent 9b8f1b7233
commit db623157aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -53,7 +53,7 @@ dependencies {
implementation ('net.fabricmc:lorenz-tiny:2.0.0+build.2') { implementation ('net.fabricmc:lorenz-tiny:2.0.0+build.2') {
transitive = false transitive = false
} }
implementation ('org.cadixdev:lorenz-io-proguard:0.5.3') implementation ('org.cadixdev:lorenz-io-proguard:0.5.5')
// decompilers // decompilers
implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.13') implementation ('net.fabricmc:procyon-fabric-compilertools:0.5.35.13')
@ -61,7 +61,7 @@ dependencies {
implementation ('org.benf:cfr:0.150') implementation ('org.benf:cfr:0.150')
// source code remapping // source code remapping
implementation ('org.cadixdev:mercury:0.1.0.fabric-SNAPSHOT') implementation ('org.cadixdev:mercury:0.1.0-rc1')
// Kapt integration // Kapt integration
compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72') compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72')

1
src/main/java/net/fabricmc/loom/util/SourceRemapper.java
View file

@ -212,6 +212,7 @@ public class SourceRemapper {
public static Mercury createMercuryWithClassPath(Project project, boolean toNamed) { public static Mercury createMercuryWithClassPath(Project project, boolean toNamed) {
Mercury m = new Mercury(); Mercury m = new Mercury();
m.setGracefulClasspathChecks(true);
for (File file : project.getConfigurations().getByName(Constants.Configurations.MINECRAFT_DEPENDENCIES).getFiles()) { for (File file : project.getConfigurations().getByName(Constants.Configurations.MINECRAFT_DEPENDENCIES).getFiles()) {
m.getClassPath().add(file.toPath()); m.getClassPath().add(file.toPath());