From 94204587692aa75c35787bf27254d28c0c18dde7 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Fri, 6 Dec 2024 12:02:18 +0000 Subject: [PATCH 1/4] Only calculate debug log width when debugging --- src/main/java/net/minecraftforge/bootstrap/Bootstrap.java | 4 +++- .../java/net/minecraftforge/bootstrap/ForgeBootstrap.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java index 5262377..541b391 100644 --- a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java @@ -198,7 +198,9 @@ 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++) { diff --git a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java index 169b869..43c5257 100644 --- a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java @@ -27,7 +27,9 @@ 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++) { From 7bf97f751ed9bd6a0b74fc6c88e0279af7e54893 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Fri, 6 Dec 2024 12:19:29 +0000 Subject: [PATCH 2/4] Likewise for paths --- src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java index 43c5257..df4c314 100644 --- a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java @@ -35,7 +35,7 @@ protected List selectRuntimeModules(List 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); From 5406c9ef9fc00a2f434ea4e9f5376dd7c2131ede Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Fri, 6 Dec 2024 12:22:07 +0000 Subject: [PATCH 3/4] Grab jar meta once instead of twice --- .../java/net/minecraftforge/bootstrap/ForgeBootstrap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java index df4c314..0e885c5 100644 --- a/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/ForgeBootstrap.java @@ -34,7 +34,8 @@ protected List selectRuntimeModules(List classpath) { if (DEBUG) log("Found classpath:"); for (int x = 0; x < classpath.size(); x++) { var jar = jars.get(x); - var name = jar.moduleDataProvider().name(); + var meta = jar.moduleDataProvider(); + var name = meta.name(); Path[] paths = DEBUG ? classpath.get(x) : null; if (bootlayer.findModule(name).isPresent()) { @@ -43,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) { From dfc41b25e94fe326eed191f0818f0679bcb83fa3 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Fri, 6 Dec 2024 12:32:33 +0000 Subject: [PATCH 4/4] For paths here as well --- src/main/java/net/minecraftforge/bootstrap/Bootstrap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java index 541b391..9293aa3 100644 --- a/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java +++ b/src/main/java/net/minecraftforge/bootstrap/Bootstrap.java @@ -206,7 +206,7 @@ protected List selectRuntimeModules(List 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);