1 files changed, 22 insertions, 10 deletions

diff --git a/src/test/java/cuchaz/enigma/TestSourceIndex.java b/src/test/java/cuchaz/enigma/TestSourceIndex.java
index 8a604f8..b1d1182 100644
--- a/src/test/java/cuchaz/enigma/TestSourceIndex.java
+++ b/src/test/java/cuchaz/enigma/TestSourceIndex.java
@@ -13,13 +13,15 @@ package cuchaz.enigma;
 
 import com.google.common.collect.Sets;
 import com.strobel.decompiler.languages.java.ast.CompilationUnit;
+import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.SourceIndex;
+import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import org.junit.Test;
 
-import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Set;
-import java.util.jar.JarFile;
 
 public class TestSourceIndex {
         @Test
@@ -27,31 +29,41 @@ public class TestSourceIndex {
                 throws Exception {
                 // Figure out where Minecraft is...
                 final String mcDir = System.getProperty("enigma.test.minecraftdir");
-                File mcJar = null;
+                Path mcJar = null;
                 if (mcDir == null) {
                         String osname = System.getProperty("os.name").toLowerCase();
                         if (osname.contains("nix") || osname.contains("nux") || osname.contains("solaris")) {
-                                mcJar = new File(System.getProperty("user.home"), ".minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getProperty("user.home"), ".minecraft/versions/1.8.3/1.8.3.jar");
                         } else if (osname.contains("mac") || osname.contains("darwin")) {
-                                mcJar = new File(System.getProperty("user.home"), "Library/Application Support/minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/versions/1.8.3/1.8.3.jar");
                         } else if (osname.contains("win")) {
-                                mcJar = new File(System.getenv("AppData"), ".minecraft/versions/1.8.3/1.8.3.jar");
+                                mcJar = Paths.get(System.getenv("AppData"), ".minecraft/versions/1.8.3/1.8.3.jar");
                         }
                 } else {
-                        mcJar = new File(mcDir, "versions/1.8.3/1.8.3.jar");
+                        mcJar = Paths.get(mcDir, "versions/1.8.3/1.8.3.jar");
                 }
 
-                Enigma enigma = new Enigma(new JarFile(mcJar));
+                if (mcJar == null) {
+                        throw new NullPointerException("Couldn't find jar");
+                }
+
+                Enigma enigma = Enigma.create();
+                EnigmaProject project = enigma.openJar(mcJar, ProgressListener.none());
+
+                ClassCache classCache = project.getClassCache();
+                JarIndex index = project.getJarIndex();
+
+                CompiledSourceTypeLoader typeLoader = new CompiledSourceTypeLoader(classCache);
+                SourceProvider sourceProvider = new SourceProvider(SourceProvider.createSettings(), typeLoader);
 
                 // get all classes that aren't inner classes
                 Set<ClassEntry> classEntries = Sets.newHashSet();
-                for (ClassEntry obfClassEntry : enigma.getJarIndex().getEntryIndex().getClasses()) {
+                for (ClassEntry obfClassEntry : index.getEntryIndex().getClasses()) {
                         if (!obfClassEntry.isInnerClass()) {
                                 classEntries.add(obfClassEntry);
                         }
                 }
 
-                SourceProvider sourceProvider = enigma.getObfSourceProvider();
                 for (ClassEntry obfClassEntry : classEntries) {
                         try {
                                 CompilationUnit tree = sourceProvider.getSources(obfClassEntry.getName());