Fix TransformForgeEnvironment using hardcoded srg mappings

architectury · Jul 13, 2024 · 252e4e2 · 252e4e2
1 parent 2c4ae6d
commit 252e4e2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/dev/architectury/transformer/transformers/TransformForgeEnvironment.java b/src/main/java/dev/architectury/transformer/transformers/TransformForgeEnvironment.java
@@ -65,6 +65,7 @@ private IMappingProvider remapEnvironment() {
     }
 
     private List<IMappingProvider> mapMixin() throws IOException {
+        String productionNamespace = System.getProperty(BuiltinProperties.FORGE_PRODUCTION_NAMESPACE, "srg");
         List<IMappingProvider> providers = new ArrayList<>();
 
         if (srg == null) {
@@ -86,7 +87,7 @@ public void acceptClass(String srcName, String dstName) {
                                     .stream()
                                     .filter(it -> Objects.equals(it.getName("intermediary"), dstName))
                                     .findFirst()
-                                    .map(it -> it.getName("srg"))
+                                    .map(it -> it.getName(productionNamespace))
                                     .orElse(dstName);
                             sink.acceptClass(srcName, srgName);
                             Logger.debug("Remap mixin class %s -> %s", srcName, srgName);
@@ -99,7 +100,7 @@ public void acceptMethod(IMappingProvider.Member method, String dstName) {
                                     .flatMap(it -> it.getMethods().stream())
                                     .filter(it -> Objects.equals(it.getName("intermediary"), dstName))
                                     .findFirst()
-                                    .map(it -> it.getName("srg"))
+                                    .map(it -> it.getName(productionNamespace))
                                     .orElse(dstName);
                             sink.acceptMethod(method, srgName);
                             Logger.debug("Remap mixin method %s#%s%s -> %s", method.owner, method.name, method.desc, srgName);
@@ -112,7 +113,7 @@ public void acceptField(IMappingProvider.Member field, String dstName) {
                                     .flatMap(it -> it.getFields().stream())
                                     .filter(it -> Objects.equals(it.getName("intermediary"), dstName))
                                     .findFirst()
-                                    .map(it -> it.getName("srg"))
+                                    .map(it -> it.getName(productionNamespace))
                                     .orElse(dstName);
                             sink.acceptField(field, srgName);
                             Logger.debug("Remap mixin field %s#%s:%s -> %s", field.owner, field.name, field.desc, srgName);