Skip to content

Only calculate debug log width when debugging #8

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

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

Only calculate debug log width when debugging #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9420458
Only calculate debug log width when debugging
PaintNinja Dec 6, 2024
7bf97f7
Likewise for paths
PaintNinja Dec 6, 2024
5406c9e
Grab jar meta once instead of twice
PaintNinja Dec 6, 2024
dfc41b2
For paths here as well
PaintNinja Dec 6, 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
6 changes: 4 additions & 2 deletions src/main/java/net/minecraftforge/bootstrap/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,15 @@ protected List<SecureJar> selectRuntimeModules(List<Path[]> classpath) {

var ret = new ArrayList<SecureJar>();
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);
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,23 @@ protected List<SecureJar> selectRuntimeModules(List<Path[]> classpath) {

var ret = new ArrayList<SecureJar>();
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);
continue;
}

// 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) {
Expand Down