From 57031041e21aa55176f577f4f56c18ffdaa93bb2 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Fri, 12 Aug 2022 19:27:01 +0700 Subject: [PATCH] MinecraftResourceUtils.m: fix unexpected states Fix: could not find inhertisFrom, launch even when download fails. Other changes: log shown dialog, fix compile warning --- Natives/JavaLauncher.m | 2 +- Natives/MinecraftResourceUtils.m | 3 ++- Natives/ios_uikit_bridge.m | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Natives/JavaLauncher.m b/Natives/JavaLauncher.m index 50e5c336..ea6602f3 100644 --- a/Natives/JavaLauncher.m +++ b/Natives/JavaLauncher.m @@ -228,7 +228,7 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi margv[++margc] = jnaLibPath; margv[++margc] = userDir; margv[++margc] = userHome; - margv[++margc] = [NSString stringWithFormat:@"-DUIScreen.maximumFramesPerSecond=%d", UIScreen.mainScreen.maximumFramesPerSecond].UTF8String; + margv[++margc] = (char *)[NSString stringWithFormat:@"-DUIScreen.maximumFramesPerSecond=%d", (int)UIScreen.mainScreen.maximumFramesPerSecond].UTF8String; margv[++margc] = "-Dorg.lwjgl.system.allocator=system"; margv[++margc] = "-Dlog4j2.formatMsgNoLookups=true"; if([getPreference(@"arccapes_enable") boolValue]) { diff --git a/Natives/MinecraftResourceUtils.m b/Natives/MinecraftResourceUtils.m index 11703584..c076276d 100644 --- a/Natives/MinecraftResourceUtils.m +++ b/Natives/MinecraftResourceUtils.m @@ -259,6 +259,7 @@ static AFURLSessionManager* manager; id inheritsFrom = [self findVersion:json[@"inheritsFrom"] inList:remoteVersionList]; if (inheritsFrom != nil) { [self processVersion:json inheritsFrom:inheritsFrom progress:mainProgress callback:callback success:success]; + return; } // If the inheritsFrom is not found, return an error @@ -473,7 +474,7 @@ static AFURLSessionManager* manager; mainProgress.totalUnitCount = [json[@"libraries"] count] + [json[@"assetIndexObj"][@"objects"] count]; id wrappedCallback = ^(NSString *s, NSProgress *p) { dispatch_async(dispatch_get_main_queue(), ^{ - callback(s, mainProgress, p); + callback(s, s?mainProgress:nil, p); }); }; diff --git a/Natives/ios_uikit_bridge.m b/Natives/ios_uikit_bridge.m index 99ae5acc..bc594c5c 100644 --- a/Natives/ios_uikit_bridge.m +++ b/Natives/ios_uikit_bridge.m @@ -21,6 +21,8 @@ jclass class_CTCAndroidInput; jmethodID method_ReceiveInput; void internal_showDialog(UIViewController *viewController, NSString* title, NSString* message) { + NSLog(@"Dialog shown: %@: %@", title, message); + UIAlertController* alert = [UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert]; @@ -45,7 +47,7 @@ JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_uikit_UIKit_showError(JNIEnv* en (*env)->ReleaseStringUTFChars(env, title, title_c); (*env)->ReleaseStringUTFChars(env, message, message_c); - NSLog(@"Dialog shown: %@: %@", title_o, message_o); + NSLog(@"Dialog shown from Java: %@: %@", title_o, message_o); dispatch_async(dispatch_get_main_queue(), ^{