Cleanup classfile reading and upgrade to latest ASM

Fixes compatibility with PaperSpigot and TacoSpigot

Author: Techcable

pom.xml

@@ -336,6 +336,12 @@
 			<groupId>org.java.net.substance</groupId>
 			<artifactId>substance</artifactId>
 			<version>6.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-all</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- MCStats (this appears to no longer be working)
 		<dependency>
@@ -349,16 +355,10 @@
 			<type>jar</type>
 			<version>1.9</version>
 		</dependency>
-		<!-- If ASM doesn't end up working out, this could also be used
 		<dependency>
-			<groupId>org.apache.bcel</groupId>
-			<artifactId>bcel</artifactId>
-			<version>6.0-SNAPSHOT</version>
-		</dependency>-->
-		<dependency>
-			<groupId>asm</groupId>
+			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm-all</artifactId>
-			<version>3.3.1</version>
+			<version>5.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>jline</groupId>
@@ -504,7 +504,7 @@
 									<include>mysql:mysql-connector-java:jar:*</include>
 									<include>commons-codec:commons-codec:jar:*</include>
 									<!--<include>org.apache.bcel:bcel:jar:*</include>-->
-									<include>asm:asm-all:jar:*</include>
+									<include>org.ow2.asm:asm-all:jar:*</include>
 									<include>jline:jline:jar:*</include>
 									<include>javax.mail:mail:jar:*</include>
 									<include>javax.activation:activation:jar:*</include>
@@ -674,7 +674,7 @@
 									</includes>
 								</filter>-->
 								<filter>
-									<artifact>asm:asm-all:jar:*</artifact>
+									<artifact>org.ow2.asm:asm-all:jar:*</artifact>
 									<includes>
 										<include>**</include>
 									</includes>

src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassDiscovery.java

@@ -1,6 +1,7 @@
 package com.laytonsmith.PureUtilities.ClassLoading;
 
 import com.laytonsmith.PureUtilities.ClassLoading.ClassMirror.ClassMirror;
+import com.laytonsmith.PureUtilities.ClassLoading.ClassMirror.ClassMirrorVisitor;
 import com.laytonsmith.PureUtilities.ClassLoading.ClassMirror.ClassReferenceMirror;
 import com.laytonsmith.PureUtilities.ClassLoading.ClassMirror.FieldMirror;
 import com.laytonsmith.PureUtilities.ClassLoading.ClassMirror.MethodMirror;
@@ -34,6 +35,8 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
+import org.objectweb.asm.ClassReader;
+
 /**
  * This class contains methods for dynamically determining things about Classes,
  * without loading them into PermGen. Search criteria is provided, (most notably
@@ -301,8 +304,10 @@ private synchronized void discover(URL rootLocation) {
 						try {
 							stream = FileUtil.readAsStream(new File(rootLocationFile,
 									f.getAbsolutePath().replaceFirst(Pattern.quote(new File(root).getAbsolutePath() + File.separator), "")));
-							ClassMirror cm = new ClassMirror(stream, new URL(url));
-							mirrors.add(cm);
+							ClassReader reader = new ClassReader(stream);
+							ClassMirrorVisitor mirrorVisitor = new ClassMirrorVisitor();
+							reader.accept(mirrorVisitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES | ClassReader.SKIP_DEBUG);
+							mirrors.add(mirrorVisitor.getMirror(new URL(url)));
 						} catch (IOException ex) {
 							Logger.getLogger(ClassDiscovery.class.getName()).log(Level.SEVERE, null, ex);
 						} finally {
@@ -334,8 +339,10 @@ private synchronized void discover(URL rootLocation) {
 						public void handle(String filename, InputStream in) {
 							if (!filename.matches(".*\\$(?:\\d)*\\.class") && filename.endsWith(".class")) {
 								try {
-									ClassMirror cm = new ClassMirror(in, rootLocationFile.toURI().toURL());
-									mirrors.add(cm);
+									ClassReader reader = new ClassReader(in);
+									ClassMirrorVisitor mirrorVisitor = new ClassMirrorVisitor();
+									reader.accept(mirrorVisitor, ClassReader.SKIP_CODE | ClassReader.SKIP_FRAMES | ClassReader.SKIP_DEBUG);
+									mirrors.add(mirrorVisitor.getMirror(rootLocationFile.toURI().toURL()));
 								} catch (IOException ex) {
 									Logger.getLogger(ClassDiscovery.class.getName()).log(Level.SEVERE, null, ex);
 								}