Skip to content

Commit

Permalink
Revert "Apply OverlayStub annotation"
Browse files Browse the repository at this point in the history
This reverts commit 3e241f7.
  • Loading branch information
Nolij committed Sep 24, 2023
1 parent d90275f commit c8376ee
Showing 1 changed file with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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", "<init>", "()V"));
mNode.instructions.add(new InsnNode(Opcodes.ATHROW));
mNode.invisibleAnnotations = new ArrayList<>();
mNode.invisibleAnnotations.add(overlayAnnotation);
classNode.methods.add(mNode);
}
}
Expand Down

0 comments on commit c8376ee

Please sign in to comment.