mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-12-23 00:51:01 +03:00
Also fixes.
This commit is contained in:
parent
d250b6432c
commit
a238f79fe6
3 changed files with 8 additions and 9 deletions
|
@ -18,24 +18,24 @@
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import ru.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public final class JARLauncherBinary extends LauncherBinary {
|
public final class JARLauncherBinary extends LauncherBinary {
|
||||||
public ArrayList<LauncherBuildTask> tasks;
|
|
||||||
public final AtomicLong count;
|
public final AtomicLong count;
|
||||||
public final Path runtimeDir;
|
public final Path runtimeDir;
|
||||||
public final Path guardDir;
|
public final Path guardDir;
|
||||||
public final Path buildDir;
|
public final Path buildDir;
|
||||||
|
public ArrayList<LauncherBuildTask> tasks;
|
||||||
|
|
||||||
public JARLauncherBinary(LaunchServer server) throws IOException {
|
public JARLauncherBinary(LaunchServer server) throws IOException {
|
||||||
super(server);
|
super(server);
|
||||||
tasks = new ArrayList<>();
|
|
||||||
tasks.add(new UnpackBuildTask(server));
|
|
||||||
tasks.add(new MainBuildTask(server));
|
|
||||||
if(server.config.enabledProGuard) tasks.add(new ProGuardBuildTask(server));
|
|
||||||
if(server.config.stripLineNumbers) tasks.add(new StripLineNumbersTask(server));
|
|
||||||
count = new AtomicLong(0);
|
count = new AtomicLong(0);
|
||||||
syncBinaryFile = server.dir.resolve(server.config.binaryName + ".jar");
|
syncBinaryFile = server.dir.resolve(server.config.binaryName + ".jar");
|
||||||
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
|
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
|
||||||
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
|
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
|
||||||
buildDir = server.dir.resolve("build");
|
buildDir = server.dir.resolve("build");
|
||||||
|
tasks = new ArrayList<>();
|
||||||
|
tasks.add(new UnpackBuildTask(server));
|
||||||
|
tasks.add(new MainBuildTask(server));
|
||||||
|
if(server.config.enabledProGuard) tasks.add(new ProGuardBuildTask(server));
|
||||||
|
if(server.config.stripLineNumbers) tasks.add(new StripLineNumbersTask(server));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -14,7 +14,7 @@ public class UnpackBuildTask implements LauncherBuildTask {
|
||||||
|
|
||||||
public UnpackBuildTask(LaunchServer server) {
|
public UnpackBuildTask(LaunchServer server) {
|
||||||
this.server = server;
|
this.server = server;
|
||||||
result = server.dir.resolve(server.config.binaryName + "-clean.jar");
|
result = server.launcherBinary.buildDir.resolve(server.config.binaryName + "-clean.jar");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -65,4 +65,3 @@ public static JsonElement jsonRequest(JsonElement request, URL url) throws IOExc
|
||||||
private HTTPRequest() {
|
private HTTPRequest() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue