Fixed prepWatch preprocessing into the wrong folder (#28)

Author: ScribbleTAS

src/main/java/com/minecrafttas/discombobulator/tasks/TaskCollectBuilds.java

@@ -1,10 +1,14 @@
 package com.minecrafttas.discombobulator.tasks;
 
-import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.stream.Stream;
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
@@ -21,17 +25,43 @@ public class TaskCollectBuilds extends DefaultTask {
 	/**
 	 * List of all build dirs
 	 */
-	private Map<String, File> buildDirs = new HashMap<>();
+	private Map<String, Path> buildDirs = new HashMap<>();
 
 	@TaskAction
 	public void collectBuilds() {
-		File collectDir = getBuildDir(getProject());
-		collectDir.mkdirs();
-		for (Entry<String, File> entry : buildDirs.entrySet()) {
-			File buildDir = entry.getValue();
-			for (File artifact : buildDir.listFiles()) {
-				artifact.renameTo(new File(collectDir, artifact.getName()));
+		Path collectDir = getBuildDir(getProject());
+
+		try {
+			if (!Files.exists(collectDir))
+				Files.createDirectory(collectDir);
+		} catch (IOException e) {
+			e.printStackTrace();
+			return;
+		}
+
+		for (Entry<String, Path> entry : buildDirs.entrySet()) {
+			Path buildDir = entry.getValue();
+			Stream<Path> stream;
+
+			try {
+				stream = Files.list(buildDir);
+			} catch (IOException e) {
+				e.printStackTrace();
+				return;
 			}
+
+			stream.forEach(path -> {
+				Path targetFile = collectDir.resolve(path.getFileName());
+
+				try {
+					Files.move(path, targetFile, StandardCopyOption.REPLACE_EXISTING);
+				} catch (IOException e) {
+					e.printStackTrace();
+					return;
+				}
+			});
+
+			stream.close();
 		}
 	}
 
@@ -43,7 +73,7 @@ public void collectBuilds() {
 	public void updateCompileTasks(List<Task> compileTasks) {
 		for (Task task : compileTasks) {
 			Project project = task.getProject();
-			this.buildDirs.put(project.getName(), new File(getBuildDir(project), "libs"));
+			this.buildDirs.put(project.getName(), getBuildDir(project).resolve("libs"));
 		}
 		this.setDependsOn(compileTasks);
 	}
@@ -52,7 +82,7 @@ public void updateCompileTasks(List<Task> compileTasks) {
 	 * @param project The project to use
 	 * @return The build directory from the project
 	 */
-	private File getBuildDir(Project project) {
-		return project.getLayout().getBuildDirectory().getAsFile().get();
+	private Path getBuildDir(Project project) {
+		return project.getLayout().getBuildDirectory().get().getAsFile().toPath();
 	}
 }

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessWatch.java

@@ -172,9 +172,10 @@ protected void onModifyFile(Path path) {
 					for (Entry<String, Path> versionPair : versions.entrySet()) {
 						String versionName = versionPair.getKey();
 						Path targetProject = versionPair.getValue();
+						Path targetSubSourceDir = targetProject.resolve("src");
 
 						// Write file
-						Path outFile = targetProject.resolve(inFile);
+						Path outFile = targetSubSourceDir.resolve(inFile);
 
 						if (ignore) {
 							Files.copy(inFile, outFile, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
@@ -185,7 +186,7 @@ protected void onModifyFile(Path path) {
 						List<String> outLines = Discombobulator.processor.preprocess(versionName, linesToProcess, filename, extension);
 
 						// If the version equals the original version, then skip it
-						if (targetProject.equals(subSourceDir)) {
+						if (targetSubSourceDir.equals(subSourceDir)) {
 							currentFileUpdater = Triple.of(outLines, path, outFile);
 							continue;
 						}