From c8376ee348ae13f8d8403b4aa30c459c0d2a147d Mon Sep 17 00:00:00 2001 From: Nolij Date: Sun, 24 Sep 2023 09:37:44 -0400 Subject: [PATCH] Revert "Apply OverlayStub annotation" This reverts commit 3e241f741742f531ec62e69d14a17015acc4c32f. --- .../classoverlay/ClassOverlayProcessor.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/classoverlay/ClassOverlayProcessor.java b/src/main/java/net/fabricmc/loom/configuration/classoverlay/ClassOverlayProcessor.java index c6f24fd1..3e599206 100644 --- a/src/main/java/net/fabricmc/loom/configuration/classoverlay/ClassOverlayProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/classoverlay/ClassOverlayProcessor.java @@ -44,7 +44,6 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.InsnNode; @@ -176,12 +175,8 @@ private static void mergeOverlayedClasses(int asmVersion, ClassNode classNode, L var overlayData = overlayedClass.overlays(); for (Overlay overlay : overlayData) { - AnnotationNode overlayAnnotation = new AnnotationNode(asmVersion, "Lnet/feltmc/loom/OverlayStub;"); if (overlay instanceof FieldOverlay fOverlay) { - FieldNode fNode = new FieldNode(fOverlay.accessFlag(), fOverlay.name(), fOverlay.descriptor().getDescriptor(), null, null); - fNode.invisibleAnnotations = new ArrayList<>(); - fNode.invisibleAnnotations.add(overlayAnnotation); - classNode.fields.add(fNode); + classNode.fields.add(new FieldNode(fOverlay.accessFlag(), fOverlay.name(), fOverlay.descriptor().getDescriptor(), null, null)); } else if (overlay instanceof MethodOverlay mOverlay) { MethodNode mNode = new MethodNode(asmVersion); mNode.name = mOverlay.name(); @@ -198,8 +193,6 @@ private static void mergeOverlayedClasses(int asmVersion, ClassNode classNode, L mNode.instructions.add(new InsnNode(Opcodes.DUP)); mNode.instructions.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, "java/lang/AssertionError", "", "()V")); mNode.instructions.add(new InsnNode(Opcodes.ATHROW)); - mNode.invisibleAnnotations = new ArrayList<>(); - mNode.invisibleAnnotations.add(overlayAnnotation); classNode.methods.add(mNode); } }