From 8f07be6cb6ca4574f3aafba4a80d663ec04553e5 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Sun, 24 Jul 2022 11:13:15 +0200 Subject: [PATCH] shared directory logic (suggestion taken from #7) --- .../lib/dependencies/DependencyLoader.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java b/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java index ae0cb53..3713982 100644 --- a/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java +++ b/src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.nio.file.Files; +import java.nio.file.Paths; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -86,7 +87,14 @@ public class DependencyLoader { } return; } - val modsDir = new File(FileUtil.getMinecraftHome(), "mods"); + String homeDir = System.getProperty("minecraft.sharedDataDir"); + if (homeDir == null) { + homeDir = System.getenv("MINECRAFT_SHARED_DATA_DIR"); + if (homeDir == null) { + homeDir = FileUtil.getMinecraftHome().getAbsolutePath(); + } + } + val modsDir = Paths.get(homeDir, "mods").toFile(); val mavenJarName = String.format("%s-%s%s.jar", artifactId, preferredVersion, (suffix != null) ? ("-" + suffix) : ""); val jarName = groupId + "-" + mavenJarName;