Merge branch 'main' into renderer/mobileglues

crystall1nedev · crystall1nedev · commit 75b7b4975bc3 · 2025-09-15T13:26:42.000-06:00
diff --git a/JavaApp/libs/others/gson-2.10.1.jar b/JavaApp/libs/others/gson-2.10.1.jar
diff --git a/JavaApp/libs/others/gson-2.13.1.jar b/JavaApp/libs/others/gson-2.13.1.jar
diff --git a/Natives/Info.plist b/Natives/Info.plist
@@ -16,18 +16,18 @@
 	<dict>
 		<key>CFBundleAlternateIcons</key>
 		<dict>
-			<key>AppIcon-Development</key>
+			<key>AppIcon-Dark</key>
 			<dict>
 				<key>CFBundleIconFiles</key>
 				<array>
-					<string>AppIcon-Development60x60</string>
+					<string>AppIcon-Dark60x60</string>
 				</array>
 			</dict>
-			<key>AppIcon-Dark</key>
+			<key>AppIcon-Development</key>
 			<dict>
 				<key>CFBundleIconFiles</key>
 				<array>
-					<string>AppIcon-Dark60x60</string>
+					<string>AppIcon-Development60x60</string>
 				</array>
 			</dict>
 		</dict>
@@ -98,17 +98,19 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
-	<key>GCSupportsControllerUserInteraction</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
 	<key>GCSupportedGameControllers</key>
 	<array>
 		<dict>
 			<key>ProfileName</key>
 			<string>ExtendedGamepad</string>
 		</dict>
 	</array>
+	<key>GCSupportsControllerUserInteraction</key>
+	<true/>
+	<key>GCSupportsGameMode</key>
+	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.games</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>filza</string>
@@ -161,6 +163,8 @@
 	<array>
 		<string>fetch</string>
 	</array>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -169,6 +173,8 @@
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>arm64</string>
@@ -189,11 +195,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIWhitePointAdaptivityStyle</key>
-	<string>UIWhitePointAdaptivityStyleGame</string>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
 	<key>UISupportsDocumentBrowser</key>
 	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<true/>
+	<key>UIWhitePointAdaptivityStyle</key>
+	<string>UIWhitePointAdaptivityStyleGame</string>
 </dict>
 </plist>
diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m
@@ -100,11 +100,15 @@ void init_loadCustomJvmFlags(int* argc, const char** argv) {
 int launchJVM(NSString *username, id launchTarget, int width, int height, int minVersion) {
     NSLog(@"[JavaLauncher] Beginning JVM launch");
 
-    if (NSBundle.mainBundle.infoDictionary[@"LCDataUUID"]) {
+    if ([NSFileManager.defaultManager fileExistsAtPath:[NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"LCAppInfo.plist"]]) {
         NSDebugLog(@"[JavaLauncher] Running in LiveContainer, skipping dyld patch");
     } else {
-        // Activate Library Validation bypass for external runtime and dylibs (JNA, etc)
-        init_bypassDyldLibValidation();
+        if(@available(iOS 19.0, *)) {
+            // Disable Library Validation bypass for iOS 26 because of stricter JIT
+        } else {
+            // Activate Library Validation bypass for external runtime and dylibs (JNA, etc)
+            init_bypassDyldLibValidation();
+        }
     }
 
 
diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
@@ -334,10 +334,10 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
                 UIKit_launchMinecraftSurfaceVC(self.view.window, self.task.metadata);
             }];
         } else {
-            self.task = nil;
-            [self setInteractionEnabled:YES forDownloading:YES];
             [self reloadProfileList];
         }
+        self.task = nil;
+        [self setInteractionEnabled:YES forDownloading:YES];
     });
 }
 
diff --git a/Natives/LauncherNewsViewController.m b/Natives/LauncherNewsViewController.m
@@ -28,7 +28,7 @@ - (void)viewDidLoad
     CGSize size = CGSizeMake(self.view.frame.size.width, self.view.frame.size.height);
     insets = UIApplication.sharedApplication.windows.firstObject.safeAreaInsets;
     
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://angelauramc.dev/wiki/changelogs/IOS.html"]];
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://wiki.angelauramc.dev/patchnotes/changelogs/IOS.html"]];
 
     WKWebViewConfiguration *webConfig = [[WKWebViewConfiguration alloc] init];
     webView = [[WKWebView alloc] initWithFrame:self.view.frame configuration:webConfig];
@@ -47,25 +47,31 @@ - (void)viewDidLoad
 
     if(!isJailbroken && getPrefBool(@"warnings.limited_ram_warn") && (roundf(NSProcessInfo.processInfo.physicalMemory / 0x1000000) < 3900)) {
         // "This device has a limited amount of memory available."
-        [self showWarningAlert:@"limited_ram" hasPreference:YES];
+        [self showWarningAlert:@"limited_ram" hasPreference:YES exitWhenCompleted:NO];
     }
 
     self.navigationItem.leftBarButtonItem = self.splitViewController.displayModeButtonItem;
     self.navigationItem.rightBarButtonItem = [sidebarViewController drawAccountButton];
     self.navigationItem.leftItemsSupplementBackButton = true;
 }
 
--(void)showWarningAlert:(NSString *)key hasPreference:(BOOL)isPreferenced {
+-(void)showWarningAlert:(NSString *)key hasPreference:(BOOL)isPreferenced exitWhenCompleted:(BOOL)shouldExit {
     UIAlertController *warning = [UIAlertController
                                       alertControllerWithTitle:localize([NSString stringWithFormat:@"login.warn.title.%@", key], nil)
-                                      message:localize([NSString stringWithFormat:@"login.warn.title.%@", key], nil)
+                                      message:localize([NSString stringWithFormat:@"login.warn.message.%@", key], nil)
                                       preferredStyle:UIAlertControllerStyleAlert];
     
     UIAlertAction *action;
     if(isPreferenced) {
         action = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
             setPrefBool([NSString stringWithFormat:@"warnings.%@_warn", key], NO);
         }];
+    } else if(shouldExit) {
+        action = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction * action) {
+            [UIApplication.sharedApplication performSelector:@selector(suspend)];
+            usleep(100*1000);
+            exit(0);
+        }];
     } else {
         action = [UIAlertAction actionWithTitle:localize(@"OK", nil) style:UIAlertActionStyleCancel handler:nil];
     }
diff --git a/Natives/UIKit+hook.h b/Natives/UIKit+hook.h
@@ -1,11 +1,10 @@
 #import <UIKit/UIKit.h>
 
-#define realUIIdiom UIDevice.currentDevice.hook_userInterfaceIdiom
+#define realUIIdiom UIDevice.currentDevice.userInterfaceIdiom
 extern NSNotificationName UIPresentationControllerPresentationTransitionWillBeginNotification;
 
 @interface UIDevice(hook)
 - (NSString *)completeOSVersion;
-- (UIUserInterfaceIdiom)hook_userInterfaceIdiom;
 @end
 
 @interface UIImageView(hook)
@@ -27,12 +26,17 @@ extern NSNotificationName UIPresentationControllerPresentationTransitionWillBegi
 
 @interface UIDevice(private)
 - (NSString *)buildVersion;
+- (void)_setActiveUserInterfaceIdiom:(NSInteger)idiom;
 @end
 
 @interface UIImage(private)
 - (UIImage *)_imageWithSize:(CGSize)size;
 @end
 
+@interface UIScreen(private)
+- (void)_setUserInterfaceIdiom:(NSInteger)idiom;
+@end
+
 @interface UITextField(private)
 @property(assign, nonatomic) NSInteger nonEditingLinebreakMode;
 @end
diff --git a/Natives/UIKit+hook.m b/Natives/UIKit+hook.m
@@ -29,7 +29,10 @@ void swizzleUIImageMethod(SEL originalAction, SEL swizzledAction) {
 }
 
 void init_hookUIKitConstructor(void) {
-    swizzle(UIDevice.class, @selector(userInterfaceIdiom), @selector(hook_userInterfaceIdiom));
+    UIUserInterfaceIdiom idiom = getPrefBool(@"debug.debug_ipad_ui") ? UIUserInterfaceIdiomPad : UIUserInterfaceIdiomPhone;
+    [UIDevice.currentDevice _setActiveUserInterfaceIdiom:idiom];
+    [UIScreen.mainScreen _setUserInterfaceIdiom:idiom];
+    
     swizzle(UIImageView.class, @selector(setImage:), @selector(hook_setImage:));
     if(UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone) {
         swizzle(UIPointerInteraction.class, @selector(_updateInteractionIsEnabled), @selector(hook__updateInteractionIsEnabled));
@@ -58,16 +61,6 @@ - (NSString *)completeOSVersion {
     return [NSString stringWithFormat:@"%@ %@ (%@)", self.systemName, self.systemVersion, self.buildVersion];
 }
 
-- (UIUserInterfaceIdiom)hook_userInterfaceIdiom {
-    if (getPrefBool(@"debug.debug_ipad_ui")) {
-        return UIUserInterfaceIdiomPad;
-    } else if (self.hook_userInterfaceIdiom == UIUserInterfaceIdiomTV) {
-        return self.hook_userInterfaceIdiom;
-    } else {
-        return UIUserInterfaceIdiomPhone;
-    }
-}
-
 @end
 
 // Patch: emulate scaleToFill for table views
diff --git a/Natives/authenticator/MicrosoftAuthenticator.m b/Natives/authenticator/MicrosoftAuthenticator.m
@@ -222,8 +222,6 @@ - (void)refreshTokenWithCallback:(Callback)callback {
         return;
     }
 
-    [self saveChanges];
-
     if ([NSDate.date timeIntervalSince1970] > [self.authData[@"expiresAt"] longValue]) {
         [self acquireAccessToken:self.tokenData[@"refreshToken"] refresh:YES callback:callback];
     } else {
diff --git a/Natives/dyld_bypass_validation.m b/Natives/dyld_bypass_validation.m
@@ -124,7 +124,7 @@ bool searchAndPatch(char *name, char *base, char *signature, int length, void *t
 
 int hooked___fcntl(int fildes, int cmd, void *param) {
     if (cmd == F_ADDFILESIGS_RETURN) {
-        const char *homeDir = getenv("POJAV_HOME");
+        const char *homeDir = getenv("CFFIXED_USER_HOME");
         char filePath[PATH_MAX];
         bzero(filePath, sizeof(filePath));
         
diff --git a/Natives/main.m b/Natives/main.m
@@ -296,10 +296,10 @@ int main(int argc, char *argv[]) {
     init_redirectStdio();
     init_logDeviceAndVer(argv[0]);
 
+    loadPreferences(NO);
     init_hookFunctions();
     init_hookUIKitConstructor();
 
-    loadPreferences(NO);
     debugLogEnabled = getPrefBool(@"general.debug_logging");
     NSLog(@"[Debugging] Debug log enabled: %@", debugLogEnabled ? @"YES" : @"NO");
 
diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car
diff --git a/Natives/resources/en.lproj/Localizable.strings b/Natives/resources/en.lproj/Localizable.strings
@@ -106,6 +106,8 @@
 "login.warn.message.legacy_ios" = "To run the next major release, this device needs to be running iOS 14 or later.";
 "login.warn.title.limited_ram" = "This device has a limited amount of memory available.";
 "login.warn.message.limited_ram" = "We recommend leaving auto RAM enabled to prevent instability and performance issues.";
+"login.warn.title.ios19_jitdead" = "Amethyst is not supported on iOS 26 or later.";
+"login.warn.message.ios19_jitdead" = "Due to changes in iOS that inhibit the ability to enable JIT, Amethyst cannot work in its current state and requires heavy research to find a new path forward.\n\nPressing OK will close the app.";
 
 "login.warn.title.demomode" = "Your account is Demo";
 "login.warn.message.demomode" = "As a replacement to offline and local mode, demo mode will allow you to sign into a Microsoft account that does not own the game and play the Java Edition trial, introduced in 1.3.1 and newer versions. Older versions contain the full game, as the official launcher does not place these restrictions. See our website to learn more about this transition from offline mode.";
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ Amethyst is a Minecraft: Java Edition launcher for Android, iOS, and iPadOS, bas
 * Microsoft account and demo mode support for logging into Minecraft.
 * ...and much more!
 
-This repository contains the code for our iOS and iPadOS port of Amethyst. Looking for [Android?](https://github.com/AngelAuraMC/Amethyst-iOS)
+This repository contains the code for our iOS and iPadOS port of Amethyst. Looking for [Android?](https://github.com/AngelAuraMC/Amethyst-Android)
 
 ## Getting started with Amethyst
-The [Amethyst wiki](https://angelauramc.dev/wiki/INSTALL.html#ios) has extensive documentation on how to install, set up, and play! For those who wish to install quickly, here's the basics:
+The [Amethyst wiki](https://wiki.angelauramc.dev/wiki/getting_started/INSTALL.html#ios) has extensive documentation on how to install, set up, and play! For those who wish to install quickly, here's the basics:
 
 ### Requirements
 At the minimum, you'll need one of the following devices on **iOS 14.0** and later:
@@ -36,16 +36,16 @@ However, we recommend one of the following devices on **iOS 14.0** and later:
 - iPad Pro (all models, except for 9.7-inch)
 
 Recommended devices provide a smoother and more enjoyable gameplay experience compared to other supported devices.
-- iOS 17.x and iOS 18.x is supported. However, a computer is required. These methods will ultilized usage of pymobiledevice3. Python 3.11.(x) must be properly set up on your computer. For more information, please check out the official Wiki: https://angelauramc.dev/wiki/JIT.html#what-are-the-methods-to-enable-jit
+- iOS 17.x and iOS 18.x is supported. However, a computer is required. For more information, please check out [the official wiki](https://wiki.angelauramc.dev/wiki/faq/ios/JIT.html#what-are-the-methods-to-enable-jit)
 
 ### Setting up to sideload
-Amethyst can be sideloaded in many ways. Our recommended solution is to install [TrollStore](https://github.com/opa334/TrollStore) if your iOS version supports it. Installing with TrollStore allows you to permenantly sign the application, automatically enable JIT, and increase memory limits.
+Amethyst can be sideloaded in many ways. Our recommended solution is to install [TrollStore](https://github.com/opa334/TrollStore) if your iOS version supports it. Installing with TrollStore allows you to permanently sign the application, automatically enable JIT, and increase memory limits.
 
 If you cannot, [AltStore](https://altstore.io) and [SideStore](https://sidestore.io) are your next best options.
 - Signing services that do not use your UDID (and use distribution certificates) are not supported, as Amethyst requires capabilities they do not allow. However, if you do managed to gain access to a Development certificate, due to it having the necessary entitlement (being com.apple.security.get-task-allow) to attach a debugger to the running process (enabling JIT), you may use a Development certificate.
   
 - Only install sideloading software and Amethyst from trusted sources. We are not responsible for any harm caused by using unofficial software.
-- Jailbreaks also benefit from permenant signing, autoJIT, and increased memory limits, however we do not recommend them for regular use.
+- Jailbreaks also benefit from permenant signing, autoJIT, and increased memory limits. However, we do not recommend them on devices intended for regular use.
 
 ### Installing Amethyst
 #### Release build (TrollStore)
@@ -65,13 +65,14 @@ These builds will be available soon, stay tuned.
 
 ### Enabling JIT
 Amethyst makes use of **just-in-time compilation**, or JIT, to provide usable speeds for the end user. JIT is not supported on iOS without the application being debugged, so workarounds are required to enable it. You can use this chart to determine the best solution for you and your setup.
-| Application         | AltStore | SideStore | TrollStore | Jitterbug          | Jailbroken |
-|---------------------|----------|-----------|------------|--------------------|------------|
-| Requires ext-device | Yes      | No        | No         | If VPN unavailable | No         |
-| Requires Wi-Fi      | Yes      | Yes       | No         | Yes                | No         |
-| Auto enabled        | Yes(*)   | No        | Yes        | No                 | Yes        |
+| Application         | AltStore | SideStore | StikDebug | TrollStore | Jitterbug          | Jailbroken |
+|---------------------|----------|-----------|-----------|------------|--------------------|------------|
+| Requires ext-device | Yes      | Yes (#)   | Yes (#)   | No         | If VPN unavailable | No         |
+| Requires Wi-Fi      | Yes      | Yes (#)   | Yes (#)   | No         | Yes                | No         |
+| Auto enabled        | Yes (*)  | No        | Yes       | Yes        | No                 | Yes        |
 
 (*) AltServer running on the local network is required.
+(#) Only the first time.
 
 ## Contributors
 Amethyst is amazing, and surprisingly stable, and it wouldn't be this way without the commmunity that helped and contribute to the project! Some notable names:

Original file line number	Diff line number	Diff line change
`@@ -334,10 +334,10 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N`
`334`	`334`	`UIKit_launchMinecraftSurfaceVC(self.view.window, self.task.metadata);`
`335`	`335`	`}];`
`336`	`336`	`} else {`
`337`		`- self.task = nil;`
`338`		`- [self setInteractionEnabled:YES forDownloading:YES];`
`339`	`337`	`[self reloadProfileList];`
`340`	`338`	`}`
	`339`	`+ self.task = nil;`
	`340`	`+ [self setInteractionEnabled:YES forDownloading:YES];`
`341`	`341`	`});`
`342`	`342`	`}`
`343`	`343`
Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,6 @@ - (void)refreshTokenWithCallback:(Callback)callback {`
`222`	`222`	`return;`
`223`	`223`	`}`
`224`	`224`
`225`		`- [self saveChanges];`
`226`		`-`
`227`	`225`	`if ([NSDate.date timeIntervalSince1970] > [self.authData[@"expiresAt"] longValue]) {`
`228`	`226`	`[self acquireAccessToken:self.tokenData[@"refreshToken"] refresh:YES callback:callback];`
`229`	`227`	`} else {`