diff --git a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java index 5262377..9293aa3 100644 --- a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java @@ -198,13 +198,15 @@ protected List selectRuntimeModules(List classpath) { var ret = new ArrayList(); var bootlayer = getClass().getModule().getLayer(); - var width = jars.stream().mapToInt(j -> j.moduleDataProvider().name().length()).max().orElse(0) + 1; + int width = DEBUG + ? jars.stream().mapToInt(j -> j.moduleDataProvider().name().length()).max().orElse(0) + 1 + : 0; if (DEBUG) log("Found classpath:"); for (int x = 0; x < classpath.size(); x++) { var jar = jars.get(x); var name = jar.moduleDataProvider().name(); - var paths = classpath.get(x); + Path[] paths = DEBUG ? classpath.get(x) : null; if (bootlayer.findModule(name).isPresent()) { log(" Bootstrap: ", width, name, paths); diff --git a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java index 169b869..0e885c5 100644 --- a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java @@ -27,13 +27,16 @@ protected List selectRuntimeModules(List classpath) { var ret = new ArrayList(); var bootlayer = getClass().getModule().getLayer(); - var width = jars.stream().mapToInt(j -> j.moduleDataProvider().name().length()).max().orElse(0) + 1; + int width = DEBUG + ? jars.stream().mapToInt(j -> j.moduleDataProvider().name().length()).max().orElse(0) + 1 + : 0; if (DEBUG) log("Found classpath:"); for (int x = 0; x < classpath.size(); x++) { var jar = jars.get(x); - var name = jar.moduleDataProvider().name(); - var paths = classpath.get(x); + var meta = jar.moduleDataProvider(); + var name = meta.name(); + Path[] paths = DEBUG ? classpath.get(x) : null; if (bootlayer.findModule(name).isPresent()) { log(" Bootstrap: ", width, name, paths); @@ -41,7 +44,6 @@ protected List selectRuntimeModules(List classpath) { } // If it's a mod we'll find it later - var meta = jar.moduleDataProvider(); if (meta.findFile(MODS_TOML).isPresent() || meta.findFile(MINECRAFT).isPresent() || meta.getManifest().getMainAttributes().getValue(MOD_TYPE) != null) {