Fix more stuff

Author: Technici4n

src/main/java/net/neoforged/neoform/runtime/actions/RecompileSourcesAction.java

@@ -1,6 +1,5 @@
 package net.neoforged.neoform.runtime.actions;
 
-import net.neoforged.neoform.runtime.artifacts.ClasspathItem;
 import net.neoforged.neoform.runtime.cache.CacheKeyBuilder;
 import net.neoforged.neoform.runtime.engine.ProcessingEnvironment;
 import net.neoforged.neoform.runtime.graph.ExecutionNodeAction;
@@ -12,8 +11,8 @@
 
 public abstract class RecompileSourcesAction extends BuiltInAction implements ExecutionNodeAction {
 
-    private ExtensibleClasspath classpath = new ExtensibleClasspath();
-    private ExtensibleClasspath sourcepath = new ExtensibleClasspath();
+    private final ExtensibleClasspath classpath = new ExtensibleClasspath();
+    private final ExtensibleClasspath sourcepath = new ExtensibleClasspath();
     private int targetJavaVersion = 21;
 
     @Override
@@ -51,18 +50,10 @@ public ExtensibleClasspath getClasspath() {
         return classpath;
     }
 
-    public void setClasspath(ExtensibleClasspath classpath) {
-        this.classpath = classpath;
-    }
-
     public ExtensibleClasspath getSourcepath() {
         return sourcepath;
     }
 
-    public void setSourcepath(ExtensibleClasspath sourcepath) {
-        this.sourcepath = sourcepath;
-    }
-
     public int getTargetJavaVersion() {
         return targetJavaVersion;
     }

src/main/java/net/neoforged/neoform/runtime/actions/RecompileSourcesActionWithECJ.java

@@ -215,8 +215,10 @@ public void computeCacheKey(CacheKeyBuilder ck) {
     @Override
     public RecompileSourcesAction copy() {
         var ret = new RecompileSourcesActionWithECJ();
-        ret.setClasspath(getClasspath().copy());
-        ret.setSourcepath(getSourcepath().copy());
+        ret.getClasspath().setOverriddenClasspath(getClasspath().getOverriddenClasspath());
+        ret.getClasspath().setAdditionalClasspath(getClasspath().getAdditionalClasspath());
+        ret.getSourcepath().setOverriddenClasspath(getSourcepath().getOverriddenClasspath());
+        ret.getSourcepath().setAdditionalClasspath(getSourcepath().getAdditionalClasspath());
         ret.setTargetJavaVersion(getTargetJavaVersion());
         return ret;
     }

src/main/java/net/neoforged/neoform/runtime/actions/RecompileSourcesActionWithJDK.java

@@ -112,8 +112,10 @@ private List<String> getCompilerOptions() {
     @Override
     public RecompileSourcesAction copy() {
         var ret = new RecompileSourcesActionWithJDK();
-        ret.setClasspath(getClasspath().copy());
-        ret.setSourcepath(getSourcepath().copy());
+        ret.getClasspath().setOverriddenClasspath(getClasspath().getOverriddenClasspath());
+        ret.getClasspath().setAdditionalClasspath(getClasspath().getAdditionalClasspath());
+        ret.getSourcepath().setOverriddenClasspath(getSourcepath().getOverriddenClasspath());
+        ret.getSourcepath().setAdditionalClasspath(getSourcepath().getAdditionalClasspath());
         ret.setTargetJavaVersion(getTargetJavaVersion());
         return ret;
     }

src/main/java/net/neoforged/neoform/runtime/actions/SelectSourcesToRecompile.java

@@ -89,13 +89,10 @@ public void run(ProcessingEnvironment environment) throws IOException, Interrupt
                     // Add trailing .java
                     sourceName += ".java";
 
-                    if (!changedSourcePaths.contains(sourceName)) {
-                        // Skip this entry
-                        continue;
+                    if (changedSourcePaths.contains(sourceName)) {
+                        // Delete!
+                        Files.delete(zfs.getPath(entry.getName()));
                     }
-
-                    // Delete!
-                    Files.delete(zfs.getPath(entry.getName()));
                 }
             }
         }

src/main/java/net/neoforged/neoform/runtime/graph/ExecutionNode.java

@@ -1,6 +1,5 @@
 package net.neoforged.neoform.runtime.graph;
 
-import net.neoforged.neoform.runtime.actions.ApplySourceTransformAction;
 import net.neoforged.neoform.runtime.utils.AnsiColor;
 import net.neoforged.neoform.runtime.utils.Logger;
 
@@ -146,16 +145,6 @@ public ExecutionNodeAction action() {
         return action;
     }
 
-    // TODO: not sure yet if this is useful
-    public <T extends ExecutionNodeAction> T actionAs(Class<T> clazz) {
-        if (clazz.isInstance(action)) {
-            return (T) action;
-        } else {
-            throw new IllegalStateException("Node " + id + " has a different action type than expected. Expected: "
-                    + clazz + " but got " + action.getClass());
-        }
-    }
-
     @Override
     public String toString() {
         return id;

src/main/java/net/neoforged/neoform/runtime/graph/transforms/ReplaceNodeOutput.java

@@ -6,8 +6,6 @@
 import net.neoforged.neoform.runtime.graph.ExecutionNodeBuilder;
 import net.neoforged.neoform.runtime.graph.NodeOutput;
 
-import java.util.List;
-
 public final class ReplaceNodeOutput extends GraphTransform {
     private final String nodeId;
     private final String outputId;