Skip to content

Commit 3e9e348

Browse files
committed
Log better errors when we can't provision java, bump provisioner to be less strict.
1 parent b697b67 commit 3e9e348

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencyResolutionManagement.versionCatalogs.register('libs') {
3030

3131
library 'gson', 'com.google.code.gson', 'gson' version '2.10.1'
3232
library 'jopt', 'net.sf.jopt-simple', 'jopt-simple' version '6.0-alpha-3'
33-
library 'jver', 'net.minecraftforge', 'java-provisioner' version '1.0.9'
33+
library 'jver', 'net.minecraftforge', 'java-provisioner' version '1.0.10'
3434
library 'srgutils', 'net.minecraftforge', 'srgutils' version '0.5.14'
3535
library 'diff', 'io.codechicken', 'DiffPatch' version '2.0.0.36' // Fuzzy patching
3636

src/main/java/net/minecraftforge/mcmaven/impl/cache/JDKCache.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import net.minecraftforge.java_provisioner.api.IJavaLocator;
1717
import net.minecraftforge.mcmaven.impl.GlobalOptions;
1818
import net.minecraftforge.util.logging.Log;
19+
import net.minecraftforge.util.logging.Log.Level;
20+
1921
import org.jetbrains.annotations.Nullable;
2022

2123
/** Represents the JDK cache for this tool. */
@@ -56,9 +58,16 @@ public File root() {
5658

5759
try {
5860
var downloaded = disco.provision(version); // Implementation detail, we only download jdks, so no need to check here
59-
if (downloaded == null) return null;
61+
if (downloaded == null) {
62+
Log.error("Failed to find JDK for " + version);
63+
for (var line : disco.logOutput())
64+
Log.error(" " + line);
65+
return null;
66+
}
6067
ret = downloaded.home();
6168
} catch (Exception e) {
69+
Log.error("Failed to provision JDK " + version);
70+
e.printStackTrace(Log.getLog(Level.ERROR));
6271
return null;
6372
}
6473

0 commit comments

Comments
 (0)