Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check libraries missing in forge installer

Browse Source
This commit is contained in:
IzzelAliz 2021-12-26 18:23:41 +08:00
parent fb0fe00038
commit 378e0f390d
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/FileDownloader.java
View File

@ -35,24 +35,27 @@ public record FileDownloader(String url, String target, String hash) implements
if (Files.isDirectory(path)) {
throw new FileAlreadyExistsException(target);
} else {
if (Util.hash(path).equals(hash)) return path;
if (Util.hash(path).equalsIgnoreCase(hash)) return path;
else Files.delete(path);
}
}
if (!Files.exists(path) && path.getParent() != null) {
Files.createDirectories(path.getParent());
}
var tmp = new File(target + ".tmp").toPath();
URL url = new URL(this.url);
try (InputStream stream = redirect(url)) {
Files.copy(stream, path, StandardCopyOption.REPLACE_EXISTING);
Files.copy(stream, tmp, StandardCopyOption.REPLACE_EXISTING);
} catch (SocketTimeoutException | SSLException e) {
throw new RuntimeException("Timeout " + url);
}
if (Files.exists(path)) {
String hash = Util.hash(path);
if (hash.equalsIgnoreCase(this.hash)) return path;
else {
Files.delete(path);
if (Files.exists(tmp)) {
String hash = Util.hash(tmp);
if (hash.equalsIgnoreCase(this.hash)) {
Files.move(tmp, path, StandardCopyOption.REPLACE_EXISTING);
return path;
} else {
Files.delete(tmp);
throw new RuntimeException("Hash not match, expect %s found %s in %s".formatted(this.hash, hash, url));
}
} else {

25
forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java
View File

@ -82,11 +82,12 @@ public class ForgeInstaller {
List<Supplier<Path>> suppliers = checkMavenNoSource(installInfo.libraries);
var sysType = File.pathSeparatorChar == ';' ? "win" : "unix";
Path path = Paths.get("libraries", "net", "minecraftforge", "forge", installInfo.installer.minecraft + "-" + installInfo.installer.forge, sysType + "_args.txt");
if (!suppliers.isEmpty() || !Files.exists(path)) {
var installForge = !Files.exists(path) || forgeClasspathMissing(path);
if (!suppliers.isEmpty() || installForge) {
System.out.println("Downloading missing libraries ...");
ExecutorService pool = Executors.newFixedThreadPool(8);
CompletableFuture<?>[] array = suppliers.stream().map(reportSupply(pool, System.out::println)).toArray(CompletableFuture[]::new);
if (!Files.exists(path)) {
if (installForge) {
CompletableFuture<?>[] futures = installForge(installInfo, pool, System.out::println);
handleFutures(System.out::println, futures);
System.out.println("Forge installation is starting, please wait... ");
@ -151,8 +152,10 @@ public class ForgeInstaller {
future.join();
} catch (CompletionException e) {
logger.accept(e.getCause().toString());
Unsafe.throwException(e.getCause());
} catch (Exception e) {
e.printStackTrace();
Unsafe.throwException(e);
}
}
}
@ -202,6 +205,23 @@ public class ForgeInstaller {
return incomplete;
}
private static boolean forgeClasspathMissing(Path path) throws Exception {
for (String arg : Files.lines(path).collect(Collectors.toList())) {
if (arg.startsWith("-p ")) {
var modules = arg.substring(2).trim();
if (!Arrays.stream(modules.split(File.pathSeparator)).map(Paths::get).allMatch(Files::exists)) {
return true;
}
} else if (arg.startsWith("-DlegacyClassPath")) {
var classpath = arg.substring("-DlegacyClassPath=".length()).trim();
if (!Arrays.stream(classpath.split(File.pathSeparator)).map(Paths::get).allMatch(Files::exists)) {
return true;
}
}
}
return false;
}
private static Map.Entry<String, List<String>> classpath(Path path, InstallInfo installInfo) throws Throwable {
boolean jvmArgs = true;
String mainClass = null;
@ -340,6 +360,7 @@ public class ForgeInstaller {
this.packages = packages;
this.target = target;
}
}
private static void addExtra(List<String> extras, MethodHandle implAddExtraMH, MethodHandle implAddExtraToAllUnnamedMH) {