From 372831bc9ee2796b23db2081db761f96439ad0c7 Mon Sep 17 00:00:00 2001 From: Adam Tunnic Date: Sat, 5 Feb 2022 11:28:51 -0500 Subject: [PATCH] Add Arc capes --- JavaApp/libs/arc_dns_injector.jar | Bin 0 -> 13243 bytes Natives/JavaLauncher.m | 6 ++++- Natives/LauncherPreferences.m | 1 + Natives/LauncherPreferencesViewController.m | 25 ++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 JavaApp/libs/arc_dns_injector.jar diff --git a/JavaApp/libs/arc_dns_injector.jar b/JavaApp/libs/arc_dns_injector.jar new file mode 100644 index 0000000000000000000000000000000000000000..3c9ddd6bf377c3efdb4f9439231f654c2b9a5332 GIT binary patch literal 13243 zcma*O1yEeiwmnR64esvl?(XgmK?V!1gC)4Tdmy;GTX1&^4uiXEkT0ow-<99H_x-

eX20*|+xK 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 XJk;-8BN!OM?~CGh=Fy+!&!_(n&s|-S literal 0 HcmV?d00001 diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m index 8ac7df2a..474711a1 100644 --- a/Natives/JavaLauncher.m +++ b/Natives/JavaLauncher.m @@ -598,7 +598,7 @@ int launchJVM(int argc, char *argv[]) { } // Check if JVM restarts if (!started) { - char *frameworkPath, *javaPath, *jnaLibPath, *userDir, *userHome, *memMin, *memMax; + char *frameworkPath, *javaPath, *jnaLibPath, *userDir, *userHome, *memMin, *memMax, *arcDNS; asprintf(&frameworkPath, "-Djava.library.path=%s/Frameworks:%s/Frameworks/libOSMesaOverride.dylib.framework", getenv("BUNDLE_PATH"), getenv("BUNDLE_PATH")); asprintf(&javaPath, "%s/bin/java", javaHome); asprintf(&jnaLibPath, "-Djna.boot.library.path=%s/Frameworks/libjnidispatch.dylib.framework", getenv("BUNDLE_PATH")); @@ -606,6 +606,7 @@ int launchJVM(int argc, char *argv[]) { asprintf(&userHome, "-Duser.home=%s", getenv("POJAV_HOME")); asprintf(&memMin, "-Xms%sM", allocmem); asprintf(&memMax, "-Xmx%sM", allocmem); + asprintf(&arcDNS, "-javaagent:%s/arc_dns_injector.jar=23.95.137.176", java_libs_path); NSLog(@"[Pre-init] Java executable path: %s", javaPath); setenv("JAVA_EXT_EXECNAME", javaPath, 1); @@ -622,6 +623,9 @@ int launchJVM(int argc, char *argv[]) { margv[margc++] = userHome; margv[margc++] = "-Dorg.lwjgl.system.allocator=system"; margv[margc++] = "-Dlog4j2.formatMsgNoLookups=true"; + if([getPreference(@"arccapes_enable") boolValue]) { + margv[margc++] = arcDNS; + } NSString *selectedAccount = getPreference(@"internal_selected_account"); if (selectedAccount != nil) { margv[margc++] = (char *) [NSString stringWithFormat:@"-Dpojav.selectedAccount=%@", selectedAccount].UTF8String; diff --git a/Natives/LauncherPreferences.m b/Natives/LauncherPreferences.m index 32d40461..8b8a6b9f 100644 --- a/Natives/LauncherPreferences.m +++ b/Natives/LauncherPreferences.m @@ -57,6 +57,7 @@ void loadPreferences() { setDefaultValueForPref(@"java_args", @""); setDefaultValueForPref(@"allocated_memory", [NSNumber numberWithFloat:roundf(([[NSProcessInfo processInfo] physicalMemory] / 1048576) * 0.30)]); setDefaultValueForPref(@"debug_logging", CONFIG_TYPE); + setDefaultValueForPref(@"arccapes_enable", @YES); setDefaultValueForPref(@"java_home", @""); setDefaultValueForPref(@"renderer", @"libgl4es_114.dylib"); setDefaultValueForPref(@"option_warn", @YES); diff --git a/Natives/LauncherPreferencesViewController.m b/Natives/LauncherPreferencesViewController.m index 385e56b0..2f0e355b 100644 --- a/Natives/LauncherPreferencesViewController.m +++ b/Natives/LauncherPreferencesViewController.m @@ -23,6 +23,7 @@ #define HOMESYM 15 #define RELAUNCH 16 #define ERASEPREF 17 +#define ARCCAPES 18 #define TAG_BTNSCALE 98 #define TAG_RESOLUTION 99 @@ -60,6 +61,7 @@ #define TAG_ERASEPREF 116 +#define TAG_ARCCAPES 117 @interface LauncherPreferencesViewController () { } @@ -528,6 +530,18 @@ int tempIndex; [erasePrefSwitch addTarget:self action:@selector(switchChanged:) forControlEvents:UIControlEventValueChanged]; [tableView addSubview:erasePrefSwitch]; + UILabel *arcCapesTextView = [[UILabel alloc] initWithFrame:CGRectMake(16.0, currY+=44.0, 0.0, 0.0)]; + arcCapesTextView.text = @"Enable Arc capes"; + arcCapesTextView.numberOfLines = 0; + [arcCapesTextView sizeToFit]; + [tableView addSubview:arcCapesTextView]; + + UISwitch *arcCapesSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(width - 62.0, currY - 5.0, 50.0, 30)]; + arcCapesSwitch.tag = TAG_ARCCAPES; + [arcCapesSwitch setOn:NO animated:NO]; + [arcCapesSwitch addTarget:self action:@selector(switchChanged:) forControlEvents:UIControlEventValueChanged]; + [tableView addSubview:arcCapesSwitch]; + CGRect frame = tableView.frame; frame.size.height = currY+=44; tableView.frame = frame; @@ -572,6 +586,8 @@ int tempIndex; handler:^(__kindof UIAction * _Nonnull action) {[self helpAlertOpt:RELAUNCH];}], [UIAction actionWithTitle:@"Reset preferences" image:[[UIImage systemImageNamed:@"trash"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] identifier:nil handler:^(__kindof UIAction * _Nonnull action) {[self helpAlertOpt:ERASEPREF];}], + [UIAction actionWithTitle:@"Enable Arc capes" image:[[UIImage systemImageNamed:@"square.and.arrow.down"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] identifier:nil + handler:^(__kindof UIAction * _Nonnull action) {[self helpAlertOpt:ARCCAPES];}], ]]; self.navigationItem.rightBarButtonItem.action = nil; self.navigationItem.rightBarButtonItem.primaryAction = nil; @@ -846,6 +862,7 @@ int tempIndex; UIAlertAction *homesym = [UIAlertAction actionWithTitle:@"Home symlink" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {[self helpAlertOpt:HOMESYM];}]; UIAlertAction *relaunch = [UIAlertAction actionWithTitle:@"Restart before launching game" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {[self helpAlertOpt:RELAUNCH];}]; UIAlertAction *erasepref = [UIAlertAction actionWithTitle:@"Reset preferences" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {[self helpAlertOpt:ERASEPREF];}]; + UIAlertAction *arccapes = [UIAlertAction actionWithTitle:@"Enable Arc capes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {[self helpAlertOpt:ARCCAPES];}]; UIAlertAction *cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]; [self setPopoverProperties:helpAlert.popoverPresentationController sender:(UIButton *)self.navigationItem.rightBarButtonItem]; [self presentViewController:helpAlert animated:YES completion:nil]; @@ -864,6 +881,8 @@ int tempIndex; [helpAlert addAction:debuglog]; [helpAlert addAction:relaunch]; [helpAlert addAction:homesym]; + [helpAlert addAction:erasepref]; + [helpAlert addAction:arccapes]; [helpAlert addAction:cancel]; } } @@ -919,6 +938,9 @@ int tempIndex; } else if (setting == ERASEPREF) { title = @"Reset preferences"; message = @"This option resets the launcher preferences to their initial state."; + } else if (setting == ARCCAPES) { + title = @"Enable Arc capes"; + message = @"This option allows you to switch from the OptiFine cape service to Arc. See more about Arc on our website."; } else { title = @"Error"; message = [NSString stringWithFormat:@"The setting %d hasn't been specified with a description.", setting]; @@ -1044,6 +1066,9 @@ int tempIndex; [eraseprefWarn addAction:ok]; } break; + case TAG_ARCCAPES: + setPreference(@"arccapes_enable", @(sender.isOn)); + break; default: NSLog(@"what does switch %ld for? implement me!", sender.tag); break;