NoIssue: Fix forge loaded root directory discovery

Author: rheimus

src/main/java/com/superzanti/serversync/filemanager/FileManager.java

@@ -20,10 +20,15 @@ public class FileManager {
 	public final Path logsDirectory;
 
 	public FileManager() {
-		// TODO could probably DRY this out a bit
-		modFilesDirectory = new PathBuilder(PathUtils.getMinecraftDirectory()).add("mods").buildPath();
-		configurationFilesDirectory = new PathBuilder(PathUtils.getMinecraftDirectory()).add("config").buildPath();
-		logsDirectory = new PathBuilder(PathUtils.getMinecraftDirectory()).add("logs").buildPath();
+		String root = PathUtils.getMinecraftDirectory();
+		
+		if (root == null) {
+			root = "";
+		}
+		
+		modFilesDirectory = new PathBuilder(root).add("mods").buildPath();
+		configurationFilesDirectory = new PathBuilder(root).add("config").buildPath();
+		logsDirectory = new PathBuilder(root).add("logs").buildPath();
 	}
 
 	public ArrayList<SyncFile> getModFiles(String directory, List<String> fileMatchPatterns,

src/main/java/com/superzanti/serversync/util/PathUtils.java

@@ -5,6 +5,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
@@ -109,44 +110,45 @@ public static String walkUp(int offset, String path) throws Exception {
 	}
 
 	/**
-	 * Uses Java reflection magic and ServerSync's {@linkplain Main} class to get jar file as {@linkplain File} object.
+	 * Uses Java reflection magic and ServerSync's {@linkplain Main} class to get
+	 * jar file as {@linkplain File} object.
+	 * 
 	 * @return ServerSync jar file
 	 */
 	public static File getServerSyncFile() {
-		return new java.io.File(Main.class.getProtectionDomain()
-				.getCodeSource()
-				.getLocation()
-				.getPath());
+		return new java.io.File(Main.class.getProtectionDomain().getCodeSource().getLocation().getPath());
 	}
 
-	/**ath.substring(0, lastIndex)
+	/**
 	 * Tries to guess Minecraft directory intelligently.
+	 * 
 	 * @return Minecraft directory location as {@link Path} object
 	 */
 	public static String getMinecraftDirectory() {
 		File jarFile = getServerSyncFile();
 		String jarFilePath = jarFile.getAbsolutePath();
-		String jarFileName = jarFile.getName();
-		int lastIndex = -1;
-		String[] directories = jarFilePath.replace("\\", "/").split("/");
-		int dirsLen = directories.length - 1;
-		if (directories[dirsLen].equals("mods")) {
-			// Length - ServerSync jar filename - "mods/"
-			// this covers mods/ServerSync.jar case
-			lastIndex = jarFilePath.length() - jarFileName.length() - 5;
-		} else if (directories[dirsLen].contains(".") && directories[dirsLen - 1].equals("mods")) {
-			// Length - ServerSync jar filename - "/" - length of directory parenting jar file - "/"
-			// this covers mods/1.12.2/ServerSync.jar case
-			lastIndex = jarFilePath.length() - jarFileName.length() - 2 - directories[dirsLen - 1].length();
-//		} else if (directories[dirsLen].equals(".minecraft")) {
-//			// Length - jar filename - "/"
-//			// this covers .minecraft/ServerSync.jar case
-//			lastIndex = jarFilePath.length() - jarFileName.length() - 1;
-		} else {
-			// According to repository wiki, ServerSync must be placed in Minecraft directory
-			lastIndex = jarFilePath.length() - jarFileName.length() - 1;
+
+		List<String> parts = Arrays.asList(jarFilePath.split("[\\\\/]"));
+		
+		if (parts.contains("file:")) {
+			// Shift past the file declaration when loaded in a forge environment
+			parts = parts.subList(parts.indexOf("file:") + 1, parts.size() - 1);
 		}
-		return jarFilePath.substring(0, lastIndex);
+
+		if (parts.contains("mods")) {
+			// ASSUMPTION: We are most likely in the mods directory of a minecraft directory
+			List<String> root = parts.subList(0, parts.indexOf("mods"));
+			PathBuilder builder = new PathBuilder();
+			root.forEach(builder::add);
+
+			return builder.toString();
+		}
+		
+		// ASSUMPTION: As users are instructed to put ServerSync in the Minecraft
+		// directory we can assume that the current directory is where serversync is
+		// supposed to be, as we are asking for the Minecraft directory it should be
+		// handled elsewhere when the directory can not be found
+		return null;
 	}
 
 	private static List<String> getPathParts(String path) {