upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix library folder detection on various JVMs.

Browse Source
This commit is contained in:
LexManos committed 2018-05-14 11:32:25 -07:00
1 parent 38c5cb6b94
commit 215157f5cd
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/fml/relauncher/libraries/LibraryManager.java
+7 -2
View File
@@ -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