Fix no newline at the end of the file

- Add message which line feed is currently used
- Add color to existing messages

Author: ScribbleTAS

src/main/java/com/minecrafttas/discombobulator/processor/FilePreprocessor.java

@@ -63,7 +63,7 @@ public void preprocessFile(Path inFile, Path outFile, String version, String ext
 
 	public Triple<List<String>, Path, Path> /*<- TODO Change to it's own class*/ preprocessVersions(Path inFile, Map<String, Path> versions, String extension, Path currentDir) throws Exception {
 
-//		System.out.println(inFile);
+		System.out.println(String.format("Preprocessing \033[0;35m%s\033[0;37m\n", inFile.getFileName().toString()));
 
 		boolean ignored = fileFilter != null && fileFilter.accept(inFile.toFile());
 
@@ -85,6 +85,7 @@ public void preprocessFile(Path inFile, Path outFile, String version, String ext
 			Path outFile = targetSubSourceDir.resolve(relativeInFile);
 
 			if (ignored) {
+				System.out.println(String.format("into version \033[0;36m%s\033[0;37m", versionName));
 				Files.copy(inFile, outFile, StandardCopyOption.REPLACE_EXISTING);
 				continue;
 			}
@@ -99,6 +100,7 @@ public void preprocessFile(Path inFile, Path outFile, String version, String ext
 			}
 
 			preprocessLines(outLines, outFile, versionName, extension);
+			System.out.println(String.format("into version \033[0;36m%s\033[0;37m", versionName));
 		}
 
 		return out;
@@ -121,7 +123,14 @@ public List<String> preprocessLines(List<String> inLines, Path outFile, String v
 
 		// Write file and update last modified date
 		Files.createDirectories(outFile.getParent());
-		Files.write(outFile, String.join(LineFeedHelper.newLine(), lines).getBytes());
+
+		StringBuilder stringBuilder = new StringBuilder();
+		String linefeed = LineFeedHelper.newLine();
+		for (String line : lines) {
+			stringBuilder.append(line);
+			stringBuilder.append(linefeed);
+		}
+		Files.write(outFile, stringBuilder.toString().getBytes());
 
 		return lines;
 	}

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

@@ -13,6 +13,7 @@
 import com.minecrafttas.discombobulator.Discombobulator;
 import com.minecrafttas.discombobulator.processor.FilePreprocessor;
 import com.minecrafttas.discombobulator.utils.BetterFileWalker;
+import com.minecrafttas.discombobulator.utils.LineFeedHelper;
 import com.minecrafttas.discombobulator.utils.SocketLock;
 
 /**
@@ -44,6 +45,8 @@ public void preprocessBase() {
 			return;
 		}
 
+		LineFeedHelper.printMessage();
+
 		System.out.println("Preprocessing base source...\n");
 
 		Path baseSourceDir = baseProjectDir.resolve("src");

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

@@ -18,6 +18,7 @@
 
 import com.minecrafttas.discombobulator.Discombobulator;
 import com.minecrafttas.discombobulator.utils.FileWatcher;
+import com.minecrafttas.discombobulator.utils.LineFeedHelper;
 import com.minecrafttas.discombobulator.utils.PathLock;
 import com.minecrafttas.discombobulator.utils.SafeFileOperations;
 import com.minecrafttas.discombobulator.utils.SocketLock;
@@ -52,6 +53,8 @@ public void preprocessWatch() {
 		Path baseProjectDir = this.getProject().getProjectDir().toPath();
 		baseSourceDir = baseProjectDir.resolve("src");
 
+		LineFeedHelper.printMessage();
+
 		Map<String, Path> versionsConfig;
 		try {
 			versionsConfig = Discombobulator.getVersionPairs(baseProjectDir);
@@ -89,7 +92,7 @@ public void preprocessWatch() {
 					SafeFileOperations.write(outFile, outLines, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
 					currentFileUpdater = null;
 
-					System.out.println(String.format("Processed the recently edited file %s\n", outFile.getFileName()));
+					System.out.println(String.format("Preprocessed the recently edited file \033[0;35m%s\033[0;37m\n", outFile.getFileName()));
 				}
 			}
 		} catch (IOException e1) {
@@ -191,7 +194,7 @@ private class FileWatcherThread extends Thread {
 
 		public FileWatcherThread(FileWatcher watcher, String version) {
 			super("FileWatcher-" + version);
-			System.out.println("Started watching " + version);
+			System.out.println(String.format("Started watching \033[0;32m%s\033[0;37m", version));
 			this.watcher = watcher;
 			this.setDaemon(true);
 			this.start();

src/main/java/com/minecrafttas/discombobulator/utils/LineFeedHelper.java

@@ -2,6 +2,17 @@
 
 public class LineFeedHelper {
 
+	public static void printMessage() {
+		String property = System.getProperty("line.seperator");
+		if ("\\n".equals(property) || "\n".equals(property)) {
+			System.out.println("Preprocessing with line seperator \033[0;32m\\n\033[0;37m\n");
+		} else if ("\\r\\n".equals(property) || "\r\n".equals(property)) {
+			System.out.println("Preprocessing with line seperator \033[0;32m\\r\\n\033[0;37m\n");
+		} else {
+			System.out.println(String.format("Preprocessing with default line seperator \033[0;32m%s\033[0;37m\nTo change this, add \033[0;33m-Dline.seperator=\"\\n\"\033[0;37m to VM arguments\n", System.lineSeparator().equals("\r\n") ? "\\r\\n" : "\\n"));
+		}
+	}
+
 	public static String newLine() {
 		String out = System.lineSeparator();
 		String property = System.getProperty("line.seperator");

src/main/java/com/minecrafttas/discombobulator/utils/SocketLock.java

@@ -26,7 +26,7 @@ public class SocketLock {
 	 */
 	public SocketLock(int port) {
 		this.port = port;
-		System.out.println(String.format("Locking Port %s", port));
+		System.out.println(String.format("Locking Port \033[0;32m%s\033[0;37m\n", port));
 		try {
 			this.socket = new ServerSocket();
 		} catch (IOException e) {