Skip to content

Add fabric.configFolder system property to set mod config path #1082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williambl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add fabric.configFolder system property to set mod config path #1082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.VisibleForTesting;
import org.objectweb.asm.Opcodes;

Expand Down Expand Up @@ -135,7 +136,7 @@ public void setGameProvider(GameProvider provider) {

private void setGameDir(Path gameDir) {
this.gameDir = gameDir.toAbsolutePath().normalize();
this.configDir = gameDir.resolve("config");
this.configDir = getConfigDirectory0();
}

@Override
Expand Down Expand Up @@ -617,9 +618,17 @@ public String[] getLaunchArguments(boolean sanitize) {

@Override
protected Path getModsDirectory0() {
String directory = System.getProperty(SystemProperties.MODS_FOLDER);
return getConfiguredOrRelativeDirectory(SystemProperties.MODS_FOLDER, "mods");
}

private Path getConfigDirectory0() {
return getConfiguredOrRelativeDirectory(SystemProperties.CONFIG_FOLDER, "config");
}

private @NotNull Path getConfiguredOrRelativeDirectory(String systemProperty, String fallbackName) {
String directory = System.getProperty(systemProperty);

return directory != null ? Paths.get(directory) : gameDir.resolve("mods");
return directory != null ? Paths.get(directory) : gameDir.resolve(fallbackName);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loader/impl/util/SystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public final class SystemProperties {
public static final String LOG_FILE = "fabric.log.file";
// minimum log level for builtin log handler
public static final String LOG_LEVEL = "fabric.log.level";
// a path to a directory to replace the default mod config directory
public static final String CONFIG_FOLDER = "fabric.configFolder";
// a path to a directory to replace the default mod search directory
public static final String MODS_FOLDER = "fabric.modsFolder";
// additional mods to load (path separator separated paths, @ prefix for meta-file with each line referencing an actual file)
Expand Down