Improve libraries folder detection

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main/java/io/github/zekerzhayard/forgewrapper/installer/detector/IFileDetector.java b/src/main/java/io/github/zekerzhayard/forgewrapper/installer/detector/IFileDetector.java
index 4f1b7c3558..1d3fb1f274 100644
--- a/src/main/java/io/github/zekerzhayard/forgewrapper/installer/detector/IFileDetector.java
+++ b/src/main/java/io/github/zekerzhayard/forgewrapper/installer/detector/IFileDetector.java
@@ -29,9 +29,17 @@ public interface IFileDetector {
             return Paths.get(libraryDir).toAbsolutePath();
         }
         try {
-            Path launcher = Paths.get(Launcher.class.getProtectionDomain().getCodeSource().getLocation().toURI()).toAbsolutePath();
-            //              /<version>  /modlauncher/mods       /cpw        /libraries
-            return launcher.getParent().getParent().getParent().getParent().getParent().toAbsolutePath();
+            Path launcher = Paths.get(Launcher.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+
+            while (!launcher.getFileName().toString().equals("libraries")) {
+                launcher = launcher.getParent();
+
+                if (launcher == null || launcher.getFileName() == null) {
+                    throw new UnsupportedOperationException("Could not detect the libraries folder - it can be manually specified with `-Dforgewrapper.librariesDir=` (Java runtime argument)");
+                }
+            }
+
+            return launcher.toAbsolutePath();
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }