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

Support mods from multiple jars and directories. #704

Merged
merged 2 commits into from
Aug 5, 2022
Merged

Support mods from multiple jars and directories. #704

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1450d
Support jar based mods from multiple paths.
modmuss50 Aug 3, 2022
50be3c0
Support mixed jar/path based mods.
modmuss50 Aug 3, 2022
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
42 changes: 23 additions & 19 deletions src/main/java/net/fabricmc/loader/impl/discovery/ModDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,40 +244,44 @@ protected ModCandidate compute() {
}
} else { // regular classes-dir or jar
try {
if (paths.size() != 1 || Files.isDirectory(paths.get(0))) {
return computeDir();
} else {
return computeJarFile();
for (Path path : paths) {
final ModCandidate candidate;

if (Files.isDirectory(path)) {
candidate = computeDir(path);
} else {
candidate = computeJarFile(path);
}

if (candidate != null) {
return candidate;
}
}
} catch (ParseMetadataException e) { // already contains all context
throw ExceptionUtil.wrap(e);
} catch (Throwable t) {
throw new RuntimeException(String.format("Error analyzing %s: %s", paths, t), t);
}

return null;
}
}

private ModCandidate computeDir() throws IOException, ParseMetadataException {
for (Path path : paths) {
Path modJson = path.resolve("fabric.mod.json");
if (!Files.exists(modJson)) continue;
private ModCandidate computeDir(Path path) throws IOException, ParseMetadataException {
Path modJson = path.resolve("fabric.mod.json");
if (!Files.exists(modJson)) return null;

LoaderModMetadata metadata;
LoaderModMetadata metadata;

try (InputStream is = Files.newInputStream(modJson)) {
metadata = parseMetadata(is, path.toString());
}

return ModCandidate.createPlain(paths, metadata, requiresRemap, Collections.emptyList());
try (InputStream is = Files.newInputStream(modJson)) {
metadata = parseMetadata(is, path.toString());
}

return null;
return ModCandidate.createPlain(paths, metadata, requiresRemap, Collections.emptyList());
}

private ModCandidate computeJarFile() throws IOException, ParseMetadataException {
assert paths.size() == 1;

try (ZipFile zf = new ZipFile(paths.get(0).toFile())) {
private ModCandidate computeJarFile(Path path) throws IOException, ParseMetadataException {
try (ZipFile zf = new ZipFile(path.toFile())) {
ZipEntry entry = zf.getEntry("fabric.mod.json");
if (entry == null) return null;

Expand Down