Skip to content
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

Version specific mods folder. #512

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Version specific mods folder. #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a7b6e
Add second level version specific mods folder
yJulian Sep 11, 2021
101a496
Add a statement to skip the search for mods if the folder does not ex…
yJulian Sep 11, 2021
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
5 changes: 4 additions & 1 deletion 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 @@ -190,9 +190,12 @@ private void setup() throws ModResolutionException {
boolean remapRegularMods = isDevelopmentEnvironment();
ModDiscoverer discoverer = new ModDiscoverer();
discoverer.addCandidateFinder(new ClasspathModCandidateFinder());
discoverer.addCandidateFinder(new DirectoryModCandidateFinder(gameDir.resolve("mods"), remapRegularMods));
discoverer.addCandidateFinder(new ArgumentModCandidateFinder(remapRegularMods));

Path modsFolder = gameDir.resolve("mods");
discoverer.addCandidateFinder(new DirectoryModCandidateFinder(modsFolder, remapRegularMods, true));
discoverer.addCandidateFinder(new DirectoryModCandidateFinder(modsFolder.resolve(getGameProvider().getNormalizedGameVersion()), remapRegularMods, false));

modCandidates = discoverer.discoverMods(this);
modCandidates = ModResolver.resolve(modCandidates);

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/net/fabricmc/loader/impl/discovery/DirectoryModCandidateFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,33 @@
public class DirectoryModCandidateFinder implements ModCandidateFinder {
private final Path path;
private final boolean requiresRemap;
private final boolean shouldCreateFolder;

public DirectoryModCandidateFinder(Path path, boolean requiresRemap) {
this(path, requiresRemap, true);
}

public DirectoryModCandidateFinder(Path path, boolean requiresRemap, boolean shouldCreateFolder) {
this.path = path;
this.requiresRemap = requiresRemap;
this.shouldCreateFolder = shouldCreateFolder;
}

@Override
public void findCandidates(ModCandidateConsumer out) {
if (!Files.exists(path)) {
if (shouldCreateFolder && !Files.exists(path)) {
try {
Files.createDirectory(path);
} catch (IOException e) {
throw new RuntimeException("Could not create directory " + path, e);
}
}

// If the folder does not exist at this point it shouldn't be searched for mods
if (!Files.exists(path)) {
return;
}

if (!Files.isDirectory(path)) {
throw new RuntimeException(path + " is not a directory!");
}
Expand Down