Skip to content

Commit 91aa379

Browse files
committed
Fix some mixin accessors not remapping correctly
1 parent 3af7cf7 commit 91aa379

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.objectweb.asm.tree.ClassNode;
1212

1313
import java.util.ArrayList;
14+
import java.util.HashMap;
1415
import java.util.List;
1516

1617
public class MixinPostApplyVisitorProvider implements TinyRemapper.ApplyVisitorProvider {
@@ -21,6 +22,8 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
2122
ClassNode node = new ClassNode();
2223
cls.accept(node, ClassReader.SKIP_FRAMES);
2324

25+
String className = cls.getName().replace(".", "/");
26+
2427
List<String> supers = new ArrayList<>();
2528

2629
for (List<AnnotationNode> nodeList : new List[]{
@@ -41,7 +44,8 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
4144
if (val instanceof Type) {
4245
theVal = ((Type) val).getInternalName();
4346
} else {
44-
theVal = (String) val;
47+
theVal = ModRemappingAPIImpl.getCurrentContext().getMixinData().getMixinRefmapData()
48+
.getOrDefault(className, new HashMap<>()).getOrDefault((String) val, (String) val);
4549
}
4650

4751
supers.add(theVal);
@@ -54,7 +58,7 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
5458
});
5559
}
5660

57-
ModRemappingAPIImpl.getCurrentContext().getMixinData().getMixin2TargetMap().put(cls.getName().replace(".", "/"), supers);
61+
ModRemappingAPIImpl.getCurrentContext().getMixinData().getMixin2TargetMap().put(className, supers);
5862

5963
return next;
6064
}

0 commit comments

Comments
 (0)