Skip to content

Fix new ClassInheritanceProvider #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaHaWTH merged 1 commit into from
Aug 3, 2025
Merged

Fix new ClassInheritanceProvider #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/catserver/server/remapper/ClassInheritanceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package catserver.server.remapper;

import net.md_5.specialsource.provider.InheritanceProvider;
import net.minecraft.launchwrapper.Launch;
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Opcodes;
Expand All @@ -16,7 +16,9 @@ public class ClassInheritanceProvider implements InheritanceProvider {
@Override
public Collection<String> getParents(String className) {
className = ReflectionTransformer.remapper.map(className);
try (InputStream is = Launch.classLoader.getResourceAsStream((className + ".class"))) {
FMLDeobfuscatingRemapper mapper = FMLDeobfuscatingRemapper.INSTANCE;
String obfName = mapper.unmap(className);
try (InputStream is = this.getClass().getClassLoader().getResourceAsStream((obfName + ".class"))) {
if (is == null) {
return null;
}
Expand All @@ -29,12 +31,12 @@ public Collection<String> getParents(String className) {
Collection<String> parents = new HashSet<>();

if (visitor.getSuperName() != null && !visitor.getSuperName().equals("java/lang/Object")) {
parents.add(reverseMap(visitor.getSuperName()));
parents.add(reverseMap(mapper.map(visitor.getSuperName())));
}

for (String inter : visitor.getInterfaces()) {
if (inter != null) {
parents.add(reverseMap(inter));
parents.add(reverseMap(mapper.map(inter)));
}
}

Expand Down