|
10 | 10 | import java.util.List; |
11 | 11 |
|
12 | 12 | import net.minecraftforge.java_provisioner.Disco.Arch; |
| 13 | +import net.minecraftforge.java_provisioner.Disco.Distro; |
13 | 14 | import net.minecraftforge.java_provisioner.api.IJavaInstall; |
14 | 15 | import net.minecraftforge.java_provisioner.util.OS; |
15 | 16 |
|
@@ -95,16 +96,28 @@ protected void error(String message) { |
95 | 96 | } |
96 | 97 | }; |
97 | 98 |
|
98 | | - List<Disco.Package> jdks = disco.getPackages(version); |
99 | | - Disco.Package pkg = null; |
| 99 | + List<Disco.Package> jdks = disco.getPackages(version, OS.CURRENT, Distro.TEMURIN, Arch.CURRENT); |
100 | 100 | if (jdks == null || jdks.isEmpty()) { |
101 | | - log("Failed to find any distros drom Disco for " + version + " " + OS.CURRENT + " " + Arch.CURRENT); |
102 | | - } else { |
103 | | - log("Found " + jdks.size() + " download canidates"); |
104 | | - pkg = jdks.get(0); |
105 | | - log("Selected " + pkg.distribution + ": " + pkg.filename); |
| 101 | + log("Failed to find any distros from Disco for " + version + " " + OS.CURRENT + " " + Arch.CURRENT + " " + Distro.TEMURIN); |
| 102 | + |
| 103 | + // Try any vendor |
| 104 | + jdks = disco.getPackages(version, OS.CURRENT, null, Arch.CURRENT); |
| 105 | + if (jdks == null || jdks.isEmpty()) { |
| 106 | + log("Failed to find any distros from Disco for " + version + " " + OS.CURRENT + " " + Arch.CURRENT); |
| 107 | + |
| 108 | + // Try any Architecture and just hope for the best |
| 109 | + jdks = disco.getPackages(version, OS.CURRENT, null, null); |
| 110 | + if (jdks == null || jdks.isEmpty()) { |
| 111 | + log("Failed to find any distros from Disco for " + version + " " + OS.CURRENT); |
| 112 | + return null; |
| 113 | + } |
| 114 | + } |
106 | 115 | } |
107 | 116 |
|
| 117 | + log("Found " + jdks.size() + " download canidates"); |
| 118 | + Disco.Package pkg = jdks.get(0); |
| 119 | + log("Selected " + pkg.distribution + ": " + pkg.filename); |
| 120 | + |
108 | 121 | File java_home = disco.extract(pkg); |
109 | 122 |
|
110 | 123 | if (java_home == null) |
|
0 commit comments