Merge remote-tracking branch 'refs/remotes/origin/main' into TheKodeToad/rework-ui

# Conflicts:
#	src/main/java/dev/frogmc/frogloader/impl/gui/LoaderGui.java
This commit is contained in:
moehreag 2024-06-12 19:03:01 +02:00
commit 9ed7490c0e

View file

@ -91,6 +91,20 @@ public class AccessWidener {
} }
return super.visitMethod(access, name, descriptor, signature, exceptions); return super.visitMethod(access, name, descriptor, signature, exceptions);
} }
@Override
public void visitInnerClass(String name, String outerName, String innerName, int access) {
Entry e = classMap.get(name);
if (e != null) {
access &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC);
access |= e.type.access;
}
if (fields.containsKey(name) || methods.containsKey(name) || mutations.containsKey(name)) {
access &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC);
access |= Opcodes.ACC_PUBLIC;
}
super.visitInnerClass(name, outerName, innerName, access);
}
}; };
reader.accept(mapper, 0); reader.accept(mapper, 0);