classpath and sourcepath work

src/main/java/io/github/astrarre/sfu/impl/SFUImpl.java

@@ -30,7 +30,7 @@ public class SFUImpl implements SourceFixerUpper {
             UNWRAP = MethodHandles.privateLookupIn(ClientCodeWrapper.class, MethodHandles.lookup())
                     .findVirtual(ClientCodeWrapper.class, "unwrap",
                             MethodType.methodType(JavaFileObject.class, JavaFileObject.class));
-        } catch (NoSuchMethodException | IllegalAccessException e) {
+        } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);
         }
     }
@@ -83,12 +83,14 @@ public SourceFixerUpper classpath(Path root) {
 
     @Override
     public void process() throws IOException {
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, charset);
+        JavacTool compiler = JavacTool.create();
         DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>();
-        JavacTool javac = JavacTool.create();
+        StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, null, charset);
 
-        JavacTaskImpl task = (JavacTaskImpl) javac.getTask(null,
+        fileManager.setLocationFromPaths(StandardLocation.CLASS_PATH, classpath);
+        fileManager.setLocationFromPaths(StandardLocation.SOURCE_PATH, sourcepath);
+
+        JavacTaskImpl task = (JavacTaskImpl) compiler.getTask(null,
                 fileManager,
                 diagnostics,
                 List.of("-proc:none"),
@@ -125,6 +127,10 @@ public void process() throws IOException {
             Files.createDirectories(sourceFile.output.getParent());
             Files.writeString(sourceFile.output, builder.toString(), charset);
         }
+
+        for (Diagnostic<? extends JavaFileObject> diagnostic : diagnostics.getDiagnostics()) {
+            System.err.println(diagnostic);
+        }
     }
 
     record WrappedJavaFileObject(JavaFileObject object, Path output) implements JavaFileObject {

src/test/java/io/github/astrarre/sfu/test/RemappingTests.java

@@ -22,6 +22,8 @@ public class RemappingTests {
     Path originals = root.resolve("original");
     Path remapped = root.resolve("remapped");
     Path mappings = root.resolve("mappings");
+    Path classpaths = root.resolve("classpath");
+    Path sourcepaths = root.resolve("sourcepath");
 
     public RemappingTests() throws IOException {
     }
@@ -35,6 +37,8 @@ public void remap(String testCase) throws IOException {
         Path original = originals.resolve(testCase);
         Path output = tempRoot.resolve(testCase);
         Path test = remapped.resolve(testCase);
+        Path classpath = classpaths.resolve(testCase + ".jar");
+        Path sourcepath = sourcepaths.resolve(testCase + ".jar");
 
         MemoryMappingTree tree = new MemoryMappingTree();
 
@@ -51,6 +55,14 @@ public void remap(String testCase) throws IOException {
             }
         });
 
+        if (Files.exists(classpath)) {
+            sfu.classpath(classpath);
+        }
+
+        if (Files.exists(sourcepath)) {
+            sfu.sourcepath(sourcepath);
+        }
+
         sfu.process();
 
         verifyDirsAreEqual(output, test, false);

src/test/resources/original/verbatim/A.java

@@ -1,3 +1,7 @@
+import it.*;
+import sources.*;
+
 // insert junk into this file; it should be converted 1 <=> 1
-public class A<WE_DO_A_LITTLE_TROLLING extends Object> {
+public class A<WE_DO_A_LITTLE_TROLLING extends Object> implements Thing {
+    Exist lol;
 }

src/test/resources/remapped/verbatim/A.java

@@ -1,3 +1,7 @@
+import it.*;
+import sources.*;
+
 // insert junk into this file; it should be converted 1 <=> 1
-public class A<WE_DO_A_LITTLE_TROLLING extends Object> {
+public class A<WE_DO_A_LITTLE_TROLLING extends Object> implements Thing {
+    Exist lol;
 }