Caching > Reflection

Author: Chocohead

Diff for: build.gradle

@@ -21,7 +21,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 archivesBaseName = 'Crafty-Crashes'
-version = '0.3'
+version = '0.4'
 
 repositories {
 	maven { 

Diff for: src/com/chocohead/cc/SMAPper.java

@@ -1,33 +1,15 @@
 package com.chocohead.cc;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
-import com.google.common.collect.Iterables;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-import org.spongepowered.asm.mixin.Mixins;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
-import org.spongepowered.asm.mixin.transformer.ClassInfo;
 
 import com.chocohead.cc.smap.FileInfo;
 import com.chocohead.cc.smap.LineInfo;
 import com.chocohead.cc.smap.SMAP;
 
 public class SMAPper {
-	private static final Field MIXINS = FieldUtils.getDeclaredField(ClassInfo.class, "mixins", true);
-
-	private static boolean hasMixins(ClassInfo type) {
-		try {
-			return !((Set<?>) MIXINS.get(type)).isEmpty();
-		} catch (ReflectiveOperationException e) {
-			throw new RuntimeException("Failed to find mixins for " + type.getName(), e);
-		}
-	}
-
 	public static void apply(Throwable t, String... skippedPackages) {
 		apply(t, new HashMap<String, SMAP>(), skippedPackages);
 	}
@@ -68,14 +50,10 @@ private static boolean apply(StackTraceElement[] elements, Map<String, SMAP> cac
 
 				smap = null;
 				if (!skip) {
-					ClassInfo info = ClassInfo.fromCache(className);
-
-					if (info != null && hasMixins(info)) {
-						String source = SourcePool.get(className);
+					String source = SourcePool.get(className);
 
-						if (source != null && source.startsWith("SMAP")) {
-							smap = SMAP.forResolved(source);
-						}
+					if (source != null && source.startsWith("SMAP")) {
+						smap = SMAP.forResolved(source);
 					}
 				}
 
@@ -97,13 +75,8 @@ private static boolean apply(StackTraceElement[] elements, Map<String, SMAP> cac
 		return modified;
 	}
 
-	private static String findMixin(FileInfo info) {
-		if (info.path != null && info.path.endsWith(".java")) {//This is very silly but also useful
-			IMixinInfo mixin = Iterables.getOnlyElement(Mixins.getMixinsForClass(info.path.substring(0, info.path.length() - 5)));
-
-			if (mixin != null) return " [" + mixin.getConfig().getName() + ']';
-		}
-
-		return "";
+	private static String findMixin(FileInfo file) {
+		IMixinInfo mixin = SourcePool.findFor(file);
+		return mixin != null ? " [" + mixin.getConfig().getName() + ']' : "";
 	}
 }

Diff for: src/com/chocohead/cc/SourcePool.java

@@ -1,10 +1,19 @@
 package com.chocohead.cc;
 
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 
+import com.google.common.collect.Iterables;
+
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+import org.spongepowered.asm.mixin.transformer.ClassInfo;
+
+import com.chocohead.cc.smap.FileInfo;
+
 public class SourcePool {
 	private static final Map<String, String> SOURCES = new HashMap<>();
+	private static final Map<FileInfo, IMixinInfo> MIXINS = new IdentityHashMap<>();
 
 	static void add(String owner, String source) {
 		if (SOURCES.put(owner, source) != null) {
@@ -15,4 +24,23 @@ static void add(String owner, String source) {
 	public static String get(String owner) {
 		return SOURCES.get(owner);
 	}
+
+	public static IMixinInfo findFor(FileInfo file) {
+		if (!MIXINS.containsKey(file)) {
+			if (file.path != null && file.path.endsWith(".java")) {
+				ClassInfo info = ClassInfo.fromCache(file.path.substring(0, file.path.length() - 5));
+
+				if (info != null && info.isMixin()) {//This is very silly but also useful
+					IMixinInfo out = Iterables.getOnlyElement(info.getAppliedMixins());
+					MIXINS.put(file, out);
+					return out;
+				}
+			}
+
+			MIXINS.put(file, null);
+			return null;			
+		} else {
+			return MIXINS.get(file);
+		}
+	}
 }