zontreck/ACLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: installer trying to download & install libraries it shouldnt

Browse source
This commit is contained in:
Ryan Dowling 2019-06-29 12:52:43 +10:00
parent d959985ffc
commit ab9040d2a4
No known key found for this signature in database
GPG key ID: 5539FCDB88950EFD
3 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vscode/snippets/java.json vendored
View file

@ -2,7 +2,7 @@
"LogManager_Log": {
"prefix": "logmanager",
"body": [
"LogManager.${1|debug,warn,logStackTrace,info,error|}(${2:\"Test\"});"
"LogManager.${1|debug,debugObject,warn,logStackTrace,info,error|}(${2:\"Test\"});"
],
"description": "Log a debug message to the ATLauncher console"
}

4
src/main/java/com/atlauncher/LogManager.java
View file

@ -53,6 +53,10 @@ public final class LogManager {
debug(message, false);
}
public static void debugObject(Object object) {
debug(Gsons.DEFAULT.toJson(object), false);
}
public static void debug(String message, boolean force) {
if (showDebug || force) {
queue.offer(new LogEvent(LogType.DEBUG, message));

55
src/main/java/com/atlauncher/workers/NewInstanceInstaller.java
View file

@ -627,17 +627,18 @@ public class NewInstanceInstaller extends InstanceInstaller {
}
private List<Downloadable> getDownloadableLibraries() {
return this.getLibraries().stream().map(library -> {
if (library instanceof ForgeLibrary && ((ForgeLibrary) library).isUsingPackXz()) {
return new ForgeXzDownloadable(library.downloads.artifact.url,
new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path),
library.downloads.artifact.sha1, library.downloads.artifact.size, this, null);
}
return this.getLibraries().stream()
.filter(library -> library.shouldInstall() && library.downloads.artifact != null).map(library -> {
if (library instanceof ForgeLibrary && ((ForgeLibrary) library).isUsingPackXz()) {
return new ForgeXzDownloadable(library.downloads.artifact.url,
new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path),
library.downloads.artifact.sha1, library.downloads.artifact.size, this, null);
}
return new Downloadable(library.downloads.artifact.url,
new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path),
library.downloads.artifact.sha1, library.downloads.artifact.size, this, false);
}).collect(Collectors.toList());
return new Downloadable(library.downloads.artifact.url,
new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path),
library.downloads.artifact.sha1, library.downloads.artifact.size, this, false);
}).collect(Collectors.toList());
}
private List<Downloadable> getDownloadableNativeLibraries() {
@ -654,29 +655,31 @@ public class NewInstanceInstaller extends InstanceInstaller {
fireTask(Language.INSTANCE.localize("instance.organisinglibraries"));
fireSubProgressUnknown();
this.getLibraries().stream().forEach(library -> {
File libraryFile = new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path);
this.getLibraries().stream().filter(library -> library.shouldInstall() && library.downloads.artifact != null)
.forEach(library -> {
File libraryFile = new File(App.settings.getGameLibrariesDir(), library.downloads.artifact.path);
if (isServer) {
File serverFile = new File(getLibrariesDirectory(), library.downloads.artifact.path);
if (isServer) {
File serverFile = new File(getLibrariesDirectory(), library.downloads.artifact.path);
serverFile.getParentFile().mkdirs();
serverFile.getParentFile().mkdirs();
Utils.copyFile(libraryFile, serverFile, true);
} else if (library.hasNativeForOS()) {
File nativeFile = new File(App.settings.getGameLibrariesDir(), library.getNativeDownloadForOS().path);
Utils.copyFile(libraryFile, serverFile, true);
} else if (library.hasNativeForOS()) {
File nativeFile = new File(App.settings.getGameLibrariesDir(),
library.getNativeDownloadForOS().path);
ZipUtil.unpack(nativeFile, this.getNativesDirectory(), new NameMapper() {
public String map(String name) {
if (library.extract != null && library.extract.shouldExclude(name)) {
return null;
}
ZipUtil.unpack(nativeFile, this.getNativesDirectory(), new NameMapper() {
public String map(String name) {
if (library.extract != null && library.extract.shouldExclude(name)) {
return null;
}
return name;
return name;
}
});
}
});
}
});
hideSubProgressBar();
}