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

Fix forge mixin remapping

Browse Source 
Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2022-03-04 09:45:59 +08:00
parent fb0f6badd5
commit 817bdb9a32
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class TinyRemapperService implements SharedService {
mappings.add(MappingsService.createDefault(project, from, to).getMappingsProvider());
if (legacyMixin) {
mappings.add(MixinMappingsService.getService(SharedServiceManager.get(project)).getMappingProvider(from, to));
mappings.add(MixinMappingsService.getService(SharedServiceManager.get(project)).getMappingProvider(from, extension.isForge() && to.equals("srg") ? "intermediary" : to));
}
return new TinyRemapperService(mappings, !legacyMixin, useKotlinExtension);

5
src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
View File

@@ -48,6 +48,7 @@ import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.util.srg.InnerClassRemapper;
import net.fabricmc.mappingio.MappingReader;
import net.fabricmc.mappingio.tree.MappingTree;
import net.fabricmc.mappingio.tree.MappingTreeView;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
/**
@@ -160,6 +161,10 @@ public final class TinyRemapperHelper {
final int fromId = mappings.getNamespaceId(from);
final int toId = mappings.getNamespaceId(to);
if (toId == MappingTreeView.NULL_NAMESPACE_ID) {
System.out.println("Warning: Trying to remap to unknown namespace: " + to);
}
for (MappingTree.ClassMapping classDef : mappings.getClasses()) {
String className = classDef.getName(fromId);
String dstName = classDef.getName(toId);