From e3e655d390f79d28a7e1ab44b8b2284199f69284 Mon Sep 17 00:00:00 2001 From: liach Date: Wed, 17 Nov 2021 17:34:41 -0600 Subject: [PATCH] This looks like why it was problematic Signed-off-by: liach --- .../fabricmc/filament/mappingpoet/ClassBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/mappingpoet/ClassBuilder.java b/filament/src/main/java/net/fabricmc/filament/mappingpoet/ClassBuilder.java index 5989657a4b..98d0a53aef 100644 --- a/filament/src/main/java/net/fabricmc/filament/mappingpoet/ClassBuilder.java +++ b/filament/src/main/java/net/fabricmc/filament/mappingpoet/ClassBuilder.java @@ -324,22 +324,22 @@ public class ClassBuilder { if (classNode.innerClasses != null) { for (InnerClassNode node : classNode.innerClasses) { if (node.name.equals(classBuilder.classNode.name)) { - if (node.outerName == null && classBuilder.recordClass) { - // Inline anonymous record. - // TODO look into moving this into the method that defines it. - return; - } - innerClassNode = node; break; } } } + if (innerClassNode == null) { // fallback classBuilder.builder.addModifiers(javax.lang.model.element.Modifier.PUBLIC); classBuilder.builder.addModifiers(javax.lang.model.element.Modifier.STATIC); } else { + if (innerClassNode.outerName == null) { + // skip local classes and records, which have null outerName + return; + } + classBuilder.builder.modifiers.remove(javax.lang.model.element.Modifier.PUBLIC); // this modifier may come from class access classBuilder.builder.addModifiers(new ModifierBuilder(innerClassNode.access) .checkUnseal(classBuilder.classNode, sealChecker)