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

[1.20.1] Backport some fixes from main #102

Merged
merged 3 commits into from
Mar 24, 2024
Merged

[1.20.1] Backport some fixes from main #102

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
438a306
Suppress error message in AbstractJarFileDependencyLocator if NSFE is…
embeddedt Mar 21, 2024
ebfa3f5
Only log errors when scanning mod file contents
embeddedt Mar 4, 2024
b742bdb
Change debug to trace
embeddedt Mar 24, 2024
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
3 changes: 2 additions & 1 deletion ...in/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileDependencyLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.Optional;

Expand All @@ -25,7 +26,7 @@ protected Optional<InputStream> loadResourceFromModFile(final IModFile modFile,
try {
return Optional.of(Files.newInputStream(modFile.findResource(path.toString())));
}
catch (final FileNotFoundException e) {
catch (final FileNotFoundException | NoSuchFileException e) {
LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName());
embeddedt marked this conversation as resolved.
Show resolved Hide resolved
return Optional.empty();
}
Expand Down
3 changes: 1 addition & 2 deletions loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@ public ModFileScanData scan() {
}

private void fileVisitor(final Path path, final ModFileScanData result) {
LOGGER.debug(LogMarkers.SCAN,"Scanning {} path {}", fileToScan, path);
try (InputStream in = Files.newInputStream(path)){
ModClassVisitor mcv = new ModClassVisitor();
ClassReader cr = new ClassReader(in);
cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG);
mcv.buildData(result.getClasses(), result.getAnnotations());
} catch (IOException | IllegalArgumentException e) {
// mark path bad
LOGGER.error(LogMarkers.SCAN,"Exception scanning {} path {}", fileToScan, path, e);
}
}
}
Loading