Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Возможность отключить предупреждение о неверной архитектуре Java и ОС

Browse source
This commit is contained in:
Gravit 2018-12-20 22:43:01 +07:00
parent f5534a1f67
commit e15e4c1e35
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
6 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -113,6 +113,7 @@ public static final class Config extends ConfigObject {
private final StringConfigEntry address;
private final String bindAddress;
public final LauncherConfig.LauncherEnvironment env;
public final boolean isWarningMissArchJava;
private Config(BlockConfigEntry block, Path coredir, LaunchServer server) {
super(block);
@ -159,6 +160,7 @@ private Config(BlockConfigEntry block, Path coredir, LaunchServer server) {
isUsingWrapper = block.getEntryValue("isUsingWrapper", BooleanConfigEntry.class);
isDownloadJava = block.getEntryValue("isDownloadJava", BooleanConfigEntry.class);
isWarningMissArchJava = block.getEntryValue("isWarningMissArchJava", BooleanConfigEntry.class);
env = LauncherConfig.LauncherEnvironment.STD;
}

5
LaunchServer/src/main/java/ru/gravit/launchserver/binary/JAConfigurator.java
View file

@ -133,6 +133,11 @@ public void setDownloadJava(boolean b) {
body.append(b ? "true" : "false");
body.append(";");
}
public void setWarningMissArchJava(boolean b) {
body.append("this.isWarningMissArchJava = ");
body.append(b ? "true" : "false");
body.append(";");
}
public ClassPool getPool() {
return pool;

1
LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg
View file

@ -9,6 +9,7 @@ authRejectString: "Вы превысили лимит авторизаций. П
isUsingWrapper: true;
isDownloadJava: false;
isWarningMissArchJava: true;
# White list testers
whitelistRejectString: "Вас нет в белом списке";

2
Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
View file

@ -257,6 +257,7 @@ public static void checkJVMBitsAndVersion() {
if (JVMHelper.JVM_BITS != JVMHelper.OS_BITS) {
String error = String.format("У Вас установлена Java %d, но Ваша система определена как %d. Установите Java правильной разрядности", JVMHelper.JVM_BITS, JVMHelper.OS_BITS);
LogHelper.error(error);
if(Launcher.getConfig().isWarningMissArchJava)
JOptionPane.showMessageDialog(null, error);
}
String jvmVersion = JVMHelper.RUNTIME_MXBEAN.getVmVersion();
@ -264,6 +265,7 @@ public static void checkJVMBitsAndVersion() {
if (jvmVersion.startsWith("10.") || jvmVersion.startsWith("9.") || jvmVersion.startsWith("11.")) {
String error = String.format("У Вас установлена Java %s. Для правильной работы необходима Java 8", JVMHelper.RUNTIME_MXBEAN.getVmVersion());
LogHelper.error(error);
if(Launcher.getConfig().isWarningMissArchJava)
JOptionPane.showMessageDialog(null, error);
}
}

1
libLauncher/src/main/java/ru/gravit/launcher/AutogenConfig.java
View file

@ -10,6 +10,7 @@ public class AutogenConfig {
public boolean isDownloadJava; //Выставление этого флага требует модификации runtime части
public String secretKeyClient;
public int env;
public boolean isWarningMissArchJava;
// 0 - Dev (дебаг включен по умолчанию, все сообщения)
// 1 - Debug (дебаг включен по умолчанию, основные сообщения)
// 2 - Std (дебаг выключен по умолчанию, основные сообщения)

4
libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java
View file

@ -44,6 +44,7 @@ public static AutogenConfig getAutogenConfig() {
public final boolean isUsingWrapper;
public final boolean isDownloadJava;
public final boolean isWarningMissArchJava;
@LauncherAPI
public LauncherConfig(HInput input) throws IOException, InvalidKeySpecException {
@ -56,6 +57,7 @@ public LauncherConfig(HInput input) throws IOException, InvalidKeySpecException
secretKeyClient = config.secretKeyClient;
isDownloadJava = config.isDownloadJava;
isUsingWrapper = config.isUsingWrapper;
isWarningMissArchJava = config.isWarningMissArchJava;
LauncherEnvironment env;
if(config.env == 0) env = LauncherEnvironment.DEV;
else if(config.env == 1) env = LauncherEnvironment.DEBUG;
@ -96,6 +98,7 @@ public LauncherConfig(String address, int port, RSAPublicKey publicKey, Map<Stri
this.clientPort = 32148;
isUsingWrapper = true;
isDownloadJava = false;
isWarningMissArchJava = true;
}
@LauncherAPI
@ -108,6 +111,7 @@ public LauncherConfig(String address, int port, RSAPublicKey publicKey, Map<Stri
this.clientPort = 32148;
isUsingWrapper = true;
isDownloadJava = false;
isWarningMissArchJava = true;
}
@Override