Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] LauncherGuard задает битность JVM

Browse source
This commit is contained in:
Gravit 2019-02-17 18:19:54 +07:00
parent ca0e8c0299
commit 44a4feacde
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
4 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java
View file

@ -7,6 +7,7 @@
public interface LauncherGuardInterface { public interface LauncherGuardInterface {
String getName(); String getName();
Path getJavaBinPath(); Path getJavaBinPath();
int getClientJVMBits();
void init(boolean clientInstance); void init(boolean clientInstance);
void addCustomParams(ClientLauncherContext context); void addCustomParams(ClientLauncherContext context);
void addCustomEnv(ClientLauncherContext context); void addCustomEnv(ClientLauncherContext context);

5
Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java
View file

@ -23,6 +23,11 @@ public Path getJavaBinPath() {
return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home")));
} }
@Override
public int getClientJVMBits() {
return JVMHelper.OS_BITS;
}
@Override @Override
public void init(boolean clientInstance) { public void init(boolean clientInstance) {

6
Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java
View file

@ -2,6 +2,7 @@
import ru.gravit.launcher.client.ClientLauncherContext; import ru.gravit.launcher.client.ClientLauncherContext;
import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.JVMHelper;
import ru.gravit.utils.helper.LogHelper; import ru.gravit.utils.helper.LogHelper;
import java.nio.file.Path; import java.nio.file.Path;
@ -19,6 +20,11 @@ public Path getJavaBinPath() {
return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home")));
} }
@Override
public int getClientJVMBits() {
return JVMHelper.JVM_BITS;
}
@Override @Override
public void init(boolean clientInstance) { public void init(boolean clientInstance) {
LogHelper.warning("Using noGuard interface"); LogHelper.warning("Using noGuard interface");

5
Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java
View file

@ -30,6 +30,11 @@ public Path getJavaBinPath() {
return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home")));
} }
@Override
public int getClientJVMBits() {
return JVMHelper.JVM_BITS;
}
@Override @Override
public void init(boolean clientInstance) { public void init(boolean clientInstance) {
try { try {