Skip to content

Add try-catch block to catch module loading errors. #134

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

Merged
marchermans merged 1 commit into from
May 30, 2025
Merged

Add try-catch block to catch module loading errors. #134

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
14 changes: 13 additions & 1 deletion src/main/java/cpw/mods/modlauncher/ModuleLayerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@
import cpw.mods.jarhandling.SecureJar;
import cpw.mods.modlauncher.api.IModuleLayerManager;
import cpw.mods.modlauncher.api.NamedPath;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.lang.module.Configuration;
import java.lang.module.ModuleFinder;
import java.lang.module.ResolutionException;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Consumer;

public final class ModuleLayerHandler implements IModuleLayerManager {
private static final Logger LOGGER = LogManager.getLogger();
record LayerInfo(ModuleLayer layer, ModuleClassLoader cl) {}

private record PathOrJar(NamedPath path, SecureJar jar) {
Expand Down Expand Up @@ -72,7 +76,15 @@ public LayerInfo buildLayer(final Layer layer, BiFunction<Configuration, List<Mo
.map(PathOrJar::build)
.toArray(SecureJar[]::new);
final var targets = Arrays.stream(finder).map(SecureJar::name).toList();
final var newConf = Configuration.resolveAndBind(JarModuleFinder.of(finder), Arrays.stream(layer.getParent()).map(completedLayers::get).map(li->li.layer().configuration()).toList(), ModuleFinder.of(), targets);
final Configuration newConf;
try {
newConf = Configuration.resolveAndBind(JarModuleFinder.of(finder), Arrays.stream(layer.getParent()).map(completedLayers::get).map(li -> li.layer().configuration()).toList(), ModuleFinder.of(), targets);
} catch (ResolutionException e) {
// Catch and log errors when two mods have the same package name, or other module loading errors
// This ensures they make it to the log file.
LOGGER.error("Error while resolving modules.", e);
throw e;
}
final var allParents = Arrays.stream(layer.getParent()).map(completedLayers::get).map(LayerInfo::layer).<ModuleLayer>mapMulti((moduleLayer, comp)-> {
comp.accept(moduleLayer);
moduleLayer.parents().forEach(comp);
Expand Down