diff --git a/build.gradle b/build.gradle index 7f18b2b8..c4f76b13 100644 --- a/build.gradle +++ b/build.gradle @@ -132,6 +132,7 @@ dependencies { // source code remapping implementation libs.fabric.mercury + implementation libs.fabric.mercury.mixin implementation libs.fabric.unpick implementation libs.fabric.unpick.utils diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bc51d2a7..9d7ee039 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ clazz-tweaker = "0.1.1" mapping-io = "0.7.1" lorenz-tiny = "4.0.2" mercury = "0.4.2" +mercury-mixin = "0.1.0" loom-native = "0.2.0" unpick = "3.0.0-beta.9" @@ -34,6 +35,7 @@ fabric-clazz-tweaker = { module = "net.fabricmc:class-tweaker", version.ref = "c fabric-mapping-io = { module = "net.fabricmc:mapping-io", version.ref = "mapping-io" } fabric-lorenz-tiny = { module = "net.fabricmc:lorenz-tiny", version.ref = "lorenz-tiny" } fabric-mercury = { module = "net.fabricmc:mercury", version.ref = "mercury" } +fabric-mercury-mixin = { module = "net.fabricmc:mercurymixin", version.ref = "mercury-mixin" } fabric-loom-nativelib = { module = "net.fabricmc:fabric-loom-native", version.ref = "loom-native" } fabric-unpick = { module = "net.fabricmc.unpick:unpick", version.ref = "unpick" } fabric-unpick-utils = { module = "net.fabricmc.unpick:unpick-format-utils", version.ref = "unpick" } diff --git a/src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java b/src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java index 152f364f..302e7219 100644 --- a/src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java +++ b/src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java @@ -32,6 +32,7 @@ import java.nio.file.Path; import org.cadixdev.lorenz.MappingSet; import org.cadixdev.mercury.Mercury; +import org.cadixdev.mercury.mixin.MixinRemapper; import org.cadixdev.mercury.remapper.MercuryRemapper; import org.gradle.api.IllegalDependencyNotation; import org.gradle.api.JavaVersion; @@ -133,6 +134,7 @@ public class MigrateMappingsService extends Service