diff --git a/Natives/LauncherPreferences.m b/Natives/LauncherPreferences.m index 0745acde..c43abd61 100644 --- a/Natives/LauncherPreferences.m +++ b/Natives/LauncherPreferences.m @@ -87,7 +87,7 @@ void fillDefaultWarningDict() { setDefaultValueForPref(warnPrefDict, @"jb_warn", @YES); setDefaultValueForPref(warnPrefDict, @"customctrl_warn", @YES); setDefaultValueForPref(warnPrefDict, @"int_warn", @YES); - setDefaultValueForPref(warnPrefDict, @"ram_unjb_warn", @YES); + setDefaultValueForPref(warnPrefDict, @"auto_ram_warn", @YES); } void loadPreferences(BOOL reset) { @@ -119,7 +119,7 @@ void loadPreferences(BOOL reset) { setDefaultValueForPref(envPrefDict, @"default_ctrl", @"default.json"); setDefaultValueForPref(envPrefDict, @"game_directory", @"default"); setDefaultValueForPref(envPrefDict, @"java_args", @""); - setDefaultValueForPref(envPrefDict, @"allocated_memory", [NSNumber numberWithFloat:roundf(([[NSProcessInfo processInfo] physicalMemory] / 1048576) * 0.30)]); + setDefaultValueForPref(envPrefDict, @"allocated_memory", [NSNumber numberWithFloat:roundf(([[NSProcessInfo processInfo] physicalMemory] / 1048576) * 0.25)]); setDefaultValueForPref(prefDict, @"restart_before_launch", @NO); setDefaultValueForPref(prefDict, @"debug_logging", CONFIG_TYPE); setDefaultValueForPref(prefDict, @"arccapes_enable", @YES); diff --git a/Natives/LauncherPreferencesViewController2.m b/Natives/LauncherPreferencesViewController2.m index 5c7b96c3..76f7b14c 100644 --- a/Natives/LauncherPreferencesViewController2.m +++ b/Natives/LauncherPreferencesViewController2.m @@ -168,8 +168,14 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *); @{@"key": @"auto_ram", @"icon": @"slider.horizontal.3", @"type": self.typeSwitch, - @"enableCondition": whenNotInGame, - //@"hidden": @(getenv("POJAV_DETECTEDJB") == NULL), + @"enableCondition": ^BOOL(){ + return getenv("POJAV_DETECTEDJB") == NULL && whenNotInGame(); + }, + @"warnAlways": @NO, + @"warnCondition": ^BOOL(){ + return getenv("POJAV_DETECTEDJB") == NULL && whenNotInGame(); + }, + @"warnKey": @"auto_ram_warn", @"requestReload": @YES }, @{@"key": @"allocated_memory", @@ -182,7 +188,7 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *); }, @"warnAlways": @NO, @"warnCondition": ^BOOL(DBNumberedSlider *view){ - return view.value >= NSProcessInfo.processInfo.physicalMemory / 1048576 * 0.4; + return view.value >= NSProcessInfo.processInfo.physicalMemory / 1048576 * 0.37; }, @"warnKey": @"mem_warn" } diff --git a/Natives/en.lproj/Localizable.strings b/Natives/en.lproj/Localizable.strings index 75e90923..540ee620 100644 --- a/Natives/en.lproj/Localizable.strings +++ b/Natives/en.lproj/Localizable.strings @@ -114,6 +114,7 @@ "preference.title.java_args" = "Custom java arguments"; "preference.placeholder.java_args" = "Specify arguments..."; "preference.title.auto_ram" = "Auto determine RAM amount"; +"preference.warn.auto_ram" = "Disabling this option on an unjailbroken devices can create instability if altered. Proceed with caution."; "preference.title.allocated_memory" = "Allocated memory (MB)"; "preference.warn.allocated_memory" = "Due to limitations in the operating system itself, this option may cause instability at this and higher values. Proceed with caution."; // sha check