From 215157f5cd5cbe1dca6afd9cc1fc4896924811a0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 14 May 2018 11:32:25 -0700 Subject: [PATCH] Fix library folder detection on various JVMs. --- .../fml/relauncher/libraries/LibraryManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java index c35665e07f..1911ce64b0 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java @@ -132,10 +132,15 @@ public class LibraryManager if (apache.isFile()) apache = apache.getParentFile(); //Get to a directory, this *should* always be the case... apache = apache.getParentFile(); //Skip the version folder. In case we ever update the version, I don't want to edit this code again. + String comp = apache.getAbsolutePath().toLowerCase(Locale.ENGLISH).replace('\\', '/'); + if (!comp.endsWith("/")) + comp += '/'; - if (!apache.getAbsolutePath().toLowerCase(Locale.ENGLISH).replace(File.separatorChar, '/').endsWith("/org/apache/maven/maven-artifact/")) + if (!comp.endsWith("/org/apache/maven/maven-artifact/")) { - FMLLog.log.error("Apache Maven library folder was not in the format expected: {}. Using default libraries directory.", new File(source.getLocation().toURI())); + FMLLog.log.error("Apache Maven library folder was not in the format expected. Using default libraries directory."); + FMLLog.log.error("Full: {}", new File(source.getLocation().toURI())); + FMLLog.log.error("Trimmed: {}", comp); return new File(minecraftHome, "libraries"); } // maven-artifact /maven /apache /org /libraries