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] getJVMTotalMemory

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

4
Launcher/runtime/dialog/overlay/settings/settings.js
View file

@ -29,9 +29,9 @@ var settingsClass = Java.extend(LauncherSettingsClass.static, {
setRAM: function(ram) { setRAM: function(ram) {
if (ram>762&&ram<1024){ if (ram>762&&ram<1024){
settings.ram = java.lang.Math["min(int,int)"](ram, FunctionalBridge.getTotalMemory()); settings.ram = java.lang.Math["min(int,int)"](ram, FunctionalBridge.getJVMTotalMemory());
}else{ }else{
settings.ram = java.lang.Math["min(int,int)"](((ram / 256) | 0) * 256, FunctionalBridge.getTotalMemory()); settings.ram = java.lang.Math["min(int,int)"](((ram / 256) | 0) * 256, FunctionalBridge.getJVMTotalMemory());
} }
}, },
}); });

19
Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java
View file

@ -3,6 +3,7 @@
import javafx.concurrent.Task; import javafx.concurrent.Task;
import ru.gravit.launcher.HWID; import ru.gravit.launcher.HWID;
import ru.gravit.launcher.LauncherAPI; import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.guard.LauncherGuardManager;
import ru.gravit.launcher.hasher.FileNameMatcher; import ru.gravit.launcher.hasher.FileNameMatcher;
import ru.gravit.launcher.hasher.HashedDir; import ru.gravit.launcher.hasher.HashedDir;
import ru.gravit.launcher.hwid.OshiHWIDProvider; import ru.gravit.launcher.hwid.OshiHWIDProvider;
@ -79,6 +80,24 @@ public static long getTotalMemory() {
return hwidProvider.getTotalMemory() >> 20; return hwidProvider.getTotalMemory() >> 20;
} }
@LauncherAPI
public static int getClientJVMBits()
{
return LauncherGuardManager.guard.getClientJVMBits();
}
@LauncherAPI
public static long getJVMTotalMemory()
{
if(getClientJVMBits() == 32)
{
return Math.min(getTotalMemory(),1536);
}
else
{
return getTotalMemory();
}
}
@LauncherAPI @LauncherAPI
public static HasherStore getDefaultHasherStore() { public static HasherStore getDefaultHasherStore() {
return HasherManager.getDefaultStore(); return HasherManager.getDefaultStore();