imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add mercury mixin to migrate mappings task. (#1413)

Browse Source
This commit is contained in:
modmuss
2025-10-31 13:16:27 +00:00
committed by GitHub
parent 3575bf3715
commit 1f1448fd19
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -132,6 +132,7 @@ dependencies {
// source code remapping // source code remapping
implementation libs.fabric.mercury implementation libs.fabric.mercury
implementation libs.fabric.mercury.mixin
implementation libs.fabric.unpick implementation libs.fabric.unpick
implementation libs.fabric.unpick.utils implementation libs.fabric.unpick.utils

2
gradle/libs.versions.toml
View File

@@ -9,6 +9,7 @@ clazz-tweaker = "0.1.1"
mapping-io = "0.7.1" mapping-io = "0.7.1"
lorenz-tiny = "4.0.2" lorenz-tiny = "4.0.2"
mercury = "0.4.2" mercury = "0.4.2"
mercury-mixin = "0.1.0"
loom-native = "0.2.0" loom-native = "0.2.0"
unpick = "3.0.0-beta.9" 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-mapping-io = { module = "net.fabricmc:mapping-io", version.ref = "mapping-io" }
fabric-lorenz-tiny = { module = "net.fabricmc:lorenz-tiny", version.ref = "lorenz-tiny" } fabric-lorenz-tiny = { module = "net.fabricmc:lorenz-tiny", version.ref = "lorenz-tiny" }
fabric-mercury = { module = "net.fabricmc:mercury", version.ref = "mercury" } 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-loom-nativelib = { module = "net.fabricmc:fabric-loom-native", version.ref = "loom-native" }
fabric-unpick = { module = "net.fabricmc.unpick:unpick", version.ref = "unpick" } fabric-unpick = { module = "net.fabricmc.unpick:unpick", version.ref = "unpick" }
fabric-unpick-utils = { module = "net.fabricmc.unpick:unpick-format-utils", version.ref = "unpick" } fabric-unpick-utils = { module = "net.fabricmc.unpick:unpick-format-utils", version.ref = "unpick" }

2
src/main/java/net/fabricmc/loom/task/service/MigrateMappingsService.java
View File

@@ -32,6 +32,7 @@ import java.nio.file.Path;
import org.cadixdev.lorenz.MappingSet; import org.cadixdev.lorenz.MappingSet;
import org.cadixdev.mercury.Mercury; import org.cadixdev.mercury.Mercury;
import org.cadixdev.mercury.mixin.MixinRemapper;
import org.cadixdev.mercury.remapper.MercuryRemapper; import org.cadixdev.mercury.remapper.MercuryRemapper;
import org.gradle.api.IllegalDependencyNotation; import org.gradle.api.IllegalDependencyNotation;
import org.gradle.api.JavaVersion; import org.gradle.api.JavaVersion;
@@ -133,6 +134,7 @@ public class MigrateMappingsService extends Service<MigrateMappingsService.Optio
).read(); ).read();
mercury.getProcessors().add(MercuryRemapper.create(mappingSet)); mercury.getProcessors().add(MercuryRemapper.create(mappingSet));
mercury.getProcessors().add(MixinRemapper.create(mappingSet));
for (File file : getOptions().getClasspath().getFiles()) { for (File file : getOptions().getClasspath().getFiles()) {
mercury.getClassPath().add(file.toPath()); mercury.getClassPath().add(file.toPath());