diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java index 3a994300..fb6e8fdd 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java @@ -7,6 +7,7 @@ public interface LauncherGuardInterface { String getName(); Path getJavaBinPath(); + int getClientJVMBits(); void init(boolean clientInstance); void addCustomParams(ClientLauncherContext context); void addCustomEnv(ClientLauncherContext context); diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java index 9367f2f1..77c4606a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java @@ -23,6 +23,11 @@ public Path getJavaBinPath() { return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); } + @Override + public int getClientJVMBits() { + return JVMHelper.OS_BITS; + } + @Override public void init(boolean clientInstance) { diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java index 7a251b3b..9bd1923c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java @@ -2,6 +2,7 @@ import ru.gravit.launcher.client.ClientLauncherContext; import ru.gravit.utils.helper.IOHelper; +import ru.gravit.utils.helper.JVMHelper; import ru.gravit.utils.helper.LogHelper; import java.nio.file.Path; @@ -19,6 +20,11 @@ public Path getJavaBinPath() { return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); } + @Override + public int getClientJVMBits() { + return JVMHelper.JVM_BITS; + } + @Override public void init(boolean clientInstance) { LogHelper.warning("Using noGuard interface"); diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java index b5c59884..bd97ebbb 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java @@ -30,6 +30,11 @@ public Path getJavaBinPath() { return IOHelper.resolveJavaBin(Paths.get(System.getProperty("java.home"))); } + @Override + public int getClientJVMBits() { + return JVMHelper.JVM_BITS; + } + @Override public void init(boolean clientInstance) { try {