Skip to content

Fix error when a mixin missing a target has an inner class #163

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

Open
Chocohead wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix error when a mixin missing a target has an inner class #163

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,13 @@ Set<String> getSyntheticInnerClasses() {
return Collections.<String>unmodifiableSet(this.getState().getSyntheticInnerClasses());
}

/**
* True if there are any user-defined inner classes for this mixin
*/
boolean hasInnerClasses() {
return !this.getState().getInnerClasses().isEmpty();
}

/**
* Get the user-defined inner classes for this mixin
*/
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,12 @@ final MixinPreProcessorStandard prepare(Extensions extensions) {
}

protected void prepareInnerClasses(Extensions extensions) {
InnerClassGenerator icg = extensions.<InnerClassGenerator>getGenerator(InnerClassGenerator.class);
for (String targetClassName : this.mixin.getDeclaredTargetClasses()) {
ClassInfo targetClassInfo = ClassInfo.forName(targetClassName);
for (String innerClass : this.mixin.getInnerClasses()) {
icg.registerInnerClass(this.mixin, targetClassInfo, innerClass);
if (this.mixin.hasInnerClasses()) {
InnerClassGenerator icg = extensions.<InnerClassGenerator>getGenerator(InnerClassGenerator.class);
for (ClassInfo targetClassInfo : this.mixin.getTargets()) {
for (String innerClass : this.mixin.getInnerClasses()) {
icg.registerInnerClass(this.mixin, targetClassInfo, innerClass);
}
}
}
}
Expand Down