Cleanups.

Author: covers1624

src/main/java/codechicken/asm/ASMReader.java

@@ -1,6 +1,8 @@
 package codechicken.asm;
 
 import org.objectweb.asm.tree.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -14,6 +16,8 @@
 
 public class ASMReader {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ASMReader.class);
+
     public static Map<String, Integer> opCodes = new HashMap<>();
     public static byte[] TYPE;
 
@@ -209,7 +213,7 @@ public static Map<String, ASMBlock> loadResource(InputStream in, String res) {
                     }
                 }
                 line = line.trim();
-                if (line.length() == 0) {
+                if (line.isEmpty()) {
                     continue;
                 }
                 if (line.startsWith("list ")) {
@@ -303,8 +307,7 @@ public static Map<String, ASMBlock> loadResource(InputStream in, String res) {
                         block.list.add(insn);
                     }
                 } catch (Exception e) {
-                    System.err.println("Error while reading ASM Block " + current + " from " + res + ", line: " + line);
-                    e.printStackTrace();
+                    LOGGER.error("Error while reading ASM Block {} from {}, line: {}", current, res, line, e);
                 }
             }
 

src/main/java/codechicken/asm/ClassHierarchyManager.java

@@ -35,8 +35,8 @@ public void flatten() {
         }
     }
 
-    public static HashMap<String, SuperCache> superclasses = new HashMap<>();
-    private static List<Function<String, byte @Nullable []>> CLASS_BYTE_LOOKUPS = new ArrayList<>(0);
+    public static final HashMap<String, SuperCache> superclasses = new HashMap<>();
+    private static final List<Function<String, byte @Nullable []>> CLASS_BYTE_LOOKUPS = new ArrayList<>(0);
 
     /**
      * Add a factory to find class bytes with.

src/main/java/codechicken/asm/ImportantInsnVisitor.java

@@ -8,7 +8,7 @@
 public class ImportantInsnVisitor extends ClassVisitor {
 
     public ImportantInsnVisitor(ClassVisitor cv) {
-        super(Opcodes.ASM4, cv);
+        super(Opcodes.ASM9, cv);
     }
 
     @Override
@@ -21,7 +21,7 @@ public class ImportantInsnMethodVisitor extends MethodVisitor {
         MethodVisitor delegate;
 
         public ImportantInsnMethodVisitor(int access, String name, String desc, String signature, String[] exceptions) {
-            super(Opcodes.ASM4, new MethodNode(access, name, desc, signature, exceptions));
+            super(Opcodes.ASM9, new MethodNode(access, name, desc, signature, exceptions));
             delegate = cv.visitMethod(access, name, desc, signature, exceptions);
         }
 

src/main/java/codechicken/asm/StackAnalyser.java

@@ -41,9 +41,9 @@ public static int width(Type[] it) {
     }
 
     public static int width(Stream<Type> stream) {
-        return stream//
-                .mapToInt(StackAnalyser::width)//
-                .reduce(Integer::sum)//
+        return stream
+                .mapToInt(StackAnalyser::width)
+                .reduce(Integer::sum)
                 .orElse(0);
     }