clean up asm a bit

Author: brachy84

src/main/java/com/cleanroommc/modularui/core/ClassTransformer.java

@@ -1,15 +1,12 @@
 package com.cleanroommc.modularui.core;
 
-import java.util.function.Consumer;
-
 import com.cleanroommc.modularui.core.temp.ClassSplicer;
 import com.cleanroommc.modularui.core.visitor.PacketByteBufferVisitor;
 
 import net.minecraft.launchwrapper.IClassTransformer;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.tree.ClassNode;
 
 public class ClassTransformer implements IClassTransformer {
 
@@ -23,23 +20,22 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
         if (ModularUICore.ae2Loaded) {
             // AE2 is missing PacketUtilPatch, patch it in
             if (transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS)) {
-                Consumer<ClassNode> consumer = (node) -> {
-                    ClassSplicer.spliceClasses(node, "com.cleanroommc.modularui.core.temp.PacketUtilPatch",
+                return ClassSplicer.processNode(basicClass, cn -> {
+                    ClassSplicer.spliceClasses(cn, "com.cleanroommc.modularui.core.temp.PacketUtilPatch",
                             "writeItemStackFromClientToServer");
-                };
-                ModularUICore.LOGGER.info("Applied {} ASM, specific for AE2, from ModularUI", transformedName);
-                return ClassSplicer.processNode(basicClass, consumer);
+                    ModularUICore.LOGGER.info("Applied {} ASM, specific for AE2, from ModularUI", transformedName);
+                });
             }
             // Don't patch over AE2's PacketBufferPatch
             return basicClass;
         }
         // Otherwise apply ModularUI's patches
         if (transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS) ||
-                    transformedName.equals(PacketByteBufferVisitor.PACKET_BUFFER_CLASS)) {
-                ClassWriter classWriter = new ClassWriter(0);
-                new ClassReader(basicClass).accept(new PacketByteBufferVisitor(classWriter), 0);
-                ModularUICore.LOGGER.info("Applied {} ASM from ModularUI", transformedName);
-                return classWriter.toByteArray();
+                transformedName.equals(PacketByteBufferVisitor.PACKET_BUFFER_CLASS)) {
+            ClassWriter classWriter = new ClassWriter(0);
+            new ClassReader(basicClass).accept(new PacketByteBufferVisitor(classWriter), 0);
+            ModularUICore.LOGGER.info("Applied {} ASM from ModularUI", transformedName);
+            return classWriter.toByteArray();
         }
         return basicClass;
     }

src/main/java/com/cleanroommc/modularui/core/temp/ClassSplicer.java

@@ -19,13 +19,6 @@
 
 package com.cleanroommc.modularui.core.temp;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-import java.util.function.Consumer;
-
 import com.cleanroommc.modularui.core.ModularUICore;
 
 import com.google.common.collect.Lists;
@@ -42,7 +35,20 @@
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.function.Consumer;
+
+/**
+ * This class only exists for compatibility with AE2. Remove once
+ * <a href="https://github.com/AE2-UEL/Applied-Energistics-2/pull/572">AE2-UEL#572</a> is merged.
+ */
+@Deprecated
 public class ClassSplicer {
+
     public static byte[] processNode(byte[] data, Consumer<ClassNode> classNodeConsumer) {
         ClassReader reader = new ClassReader(data);
         ClassNode nodeOrig = new ClassNode();
@@ -61,7 +67,6 @@ public static void spliceClasses(final ClassNode data, final String className, f
         }
     }
 
-
     public static void spliceClasses(final ClassNode nodeData, final byte[] dataSplice, final String className, final String... methods) {
         // System.out.println("Splicing from " + className + " to " + targetClassName)
         if (dataSplice == null) {
@@ -96,18 +101,15 @@ public String map(final String name) {
                 boolean added = false;
 
                 for (int j = 0; j < nodeData.methods.size(); j++) {
-                    if (nodeData.methods.get(j).name.equals(mn.name)
-                            && nodeData.methods.get(j).desc.equals(mn.desc)) {
+                    if (nodeData.methods.get(j).name.equals(mn.name) && nodeData.methods.get(j).desc.equals(mn.desc)) {
                         MethodNode oldMn = nodeData.methods.get(j);
                         System.out.println("Spliced in METHOD: " + targetClassName + "." + mn.name);
                         nodeData.methods.set(j, mn);
                         if (nodeData.name.equals(nodeSplice.superName)) {
                             ListIterator<AbstractInsnNode> nodeListIterator = mn.instructions.iterator();
                             while (nodeListIterator.hasNext()) {
                                 AbstractInsnNode node = nodeListIterator.next();
-                                if (node instanceof MethodInsnNode
-                                        && node.getOpcode() == Opcodes.INVOKESPECIAL) {
-                                    MethodInsnNode methodNode = (MethodInsnNode) node;
+                                if (node instanceof MethodInsnNode methodNode && node.getOpcode() == Opcodes.INVOKESPECIAL) {
                                     if (targetClassName2.equals(methodNode.owner)) {
                                         methodNode.owner = nodeData.superName;
                                     }
@@ -152,6 +154,5 @@ public String map(final String name) {
                 }
             }
         }
-
     }
 }

src/main/java/com/cleanroommc/modularui/core/temp/PacketUtilPatch.java

@@ -26,6 +26,11 @@
 
 import io.netty.buffer.ByteBuf;
 
+/**
+ * This class only exists for compatibility with AE2. Remove once
+ * <a href="https://github.com/AE2-UEL/Applied-Energistics-2/pull/572">AE2-UEL#572</a> is merged.
+ */
+@Deprecated
 public class PacketUtilPatch extends PacketBuffer {
 
     public PacketUtilPatch(ByteBuf wrapped) {