Skip to content

feat: add ability to customize fabric directories #671

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

Closed
zebp wants to merge 1 commit into from
Closed

feat: add ability to customize fabric directories #671

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
11 changes: 9 additions & 2 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 @@ -21,6 +21,7 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -128,7 +129,7 @@ public void setGameProvider(GameProvider provider) {

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

@Override
Expand Down Expand Up @@ -194,6 +195,12 @@ public void load() {
}
}

private Path resolveFabricDirectory(String directoryName) {
String propertyName = "fabric.dir." + directoryName;
Path directory = Paths.get(System.getProperty(propertyName, directoryName));
return directory.isAbsolute() ? directory : getGameDir().resolve(directory);
}

private void setup() throws ModResolutionException {
boolean remapRegularMods = isDevelopmentEnvironment();
VersionOverrides versionOverrides = new VersionOverrides();
Expand All @@ -203,7 +210,7 @@ private void setup() throws ModResolutionException {

ModDiscoverer discoverer = new ModDiscoverer(versionOverrides, depOverrides);
discoverer.addCandidateFinder(new ClasspathModCandidateFinder());
discoverer.addCandidateFinder(new DirectoryModCandidateFinder(gameDir.resolve("mods"), remapRegularMods));
discoverer.addCandidateFinder(new DirectoryModCandidateFinder(resolveFabricDirectory("mods"), remapRegularMods));
discoverer.addCandidateFinder(new ArgumentModCandidateFinder(remapRegularMods));

Map<String, Set<ModCandidate>> envDisabledMods = new HashMap<>();
Expand Down