Skip to content

Commit 9682419

Browse files
authored
Fix new ClassInheritanceProvider (#26)
1 parent cde7f1f commit 9682419

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/main/java/catserver/server/remapper/ClassInheritanceProvider.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package catserver.server.remapper;
22

33
import net.md_5.specialsource.provider.InheritanceProvider;
4-
import net.minecraft.launchwrapper.Launch;
4+
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
55
import org.objectweb.asm.ClassReader;
66
import org.objectweb.asm.ClassVisitor;
77
import org.objectweb.asm.Opcodes;
@@ -16,7 +16,9 @@ public class ClassInheritanceProvider implements InheritanceProvider {
1616
@Override
1717
public Collection<String> getParents(String className) {
1818
className = ReflectionTransformer.remapper.map(className);
19-
try (InputStream is = Launch.classLoader.getResourceAsStream((className + ".class"))) {
19+
FMLDeobfuscatingRemapper mapper = FMLDeobfuscatingRemapper.INSTANCE;
20+
String obfName = mapper.unmap(className);
21+
try (InputStream is = this.getClass().getClassLoader().getResourceAsStream((obfName + ".class"))) {
2022
if (is == null) {
2123
return null;
2224
}
@@ -29,12 +31,12 @@ public Collection<String> getParents(String className) {
2931
Collection<String> parents = new HashSet<>();
3032

3133
if (visitor.getSuperName() != null && !visitor.getSuperName().equals("java/lang/Object")) {
32-
parents.add(reverseMap(visitor.getSuperName()));
34+
parents.add(reverseMap(mapper.map(visitor.getSuperName())));
3335
}
3436

3537
for (String inter : visitor.getInterfaces()) {
3638
if (inter != null) {
37-
parents.add(reverseMap(inter));
39+
parents.add(reverseMap(mapper.map(inter)));
3840
}
3941
}
4042

0 commit comments

Comments
 (0)