PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fix

Browse Source
This commit is contained in:
khanhduytran0 committed 2020-12-29 15:55:30 +07:00
1 parent 65d09c6c4e
commit 4536e170e4
3 files changed
+35 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/kdt/pojavlaunch/PLaunchApp.java
+2 -4
View File
@@ -6,10 +6,8 @@ import javafx.application.Application;
import org.lwjgl.glfw.CallbackBridge;
import org.robovm.apple.foundation.Foundation;
import org.robovm.apple.foundation.NSAutoreleasePool;
import org.robovm.apple.foundation.*;
import org.robovm.apple.uikit.*;
import org.robovm.pods.dialog.*;
import net.kdt.pojavlaunch.prefs.*;
@@ -57,7 +55,7 @@ public class PLaunchApp extends UIApplicationDelegateAdapter {
// WindowAlertController alertController = new WindowAlertController("Error", sw.toString(), UIAlertControllerStyle.Alert);
// alertController.addAction(new UIAlertAction("OK",
// UIAlertActionStyle.Default, (action) -> {
// alertController.didDismiss();
// alertController.dismissViewController(true, null);
// }
// ));
// alertController.show();
src/main/java/net/kdt/pojavlaunch/PLaunchJFXApp.java
+5 -1
View File
@@ -46,7 +46,11 @@ public class PLaunchJFXApp extends Application {
MinecraftAccount acc = new MinecraftAccount();
JMinecraftVersionList.Version version = Tools.getVersionInfo(mcver);
Tools.launchMinecraft(acc, version);
try {
Tools.launchMinecraft(acc, version);
} catch (Throwable th) {
Tools.showError(th);
}
/*
net.minecraft.client.main.Main.main(new String[]{
src/main/java/net/kdt/pojavlaunch/Tools.java
+28 -66
View File
@@ -15,6 +15,10 @@ import net.kdt.pojavlaunch.utils.*;
import net.kdt.pojavlaunch.value.*;
import org.lwjgl.glfw.*;
import org.robovm.apple.foundation.*;
import org.robovm.apple.uikit.*;
import org.robovm.pods.dialog.*;
public final class Tools
{
public static final boolean ENABLE_DEV_FEATURES = true; // BuildConfig.DEBUG;
@@ -351,80 +355,38 @@ public final class Tools
showError(ctx, e);
}
}
public static void showError(Context ctx, Throwable e) {
showError(ctx, e, false);
*/
public static void showError(Throwable e) {
showError(e, false);
}
public static void showError(final Context ctx, final Throwable e, final boolean exitIfOk) {
showError(ctx, R.string.global_error, e, exitIfOk, false);
public static void showError(final Throwable e, final boolean exitIfOk) {
showError("Error", e, exitIfOk, false);
}
public static void showError(final Context ctx, final int titleId, final Throwable e, final boolean exitIfOk) {
showError(ctx, titleId, e, exitIfOk, false);
public static void showError(final String title, final Throwable e, final boolean exitIfOk) {
showError(title, e, exitIfOk, false);
}
private static void showError(final Context ctx, final int titleId, final Throwable e, final boolean exitIfOk, final boolean showMore) {
e.printStackTrace();
private static void showError(final String title, final Throwable e, final boolean exitIfOk, final boolean showMore) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
pw.flush();
Runnable runnable = new Runnable(){
@Override
public void run()
{
final String errMsg = showMore ? Log.getStackTraceString(e): e.getMessage();
new AlertDialog.Builder((Context) ctx)
.setTitle(titleId)
.setMessage(errMsg)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2)
{
if(exitIfOk) {
if (ctx instanceof BaseMainActivity) {
BaseMainActivity.fullyExit();
} else if (ctx instanceof Activity) {
((Activity) ctx).finish();
}
}
}
})
.setNegativeButton(showMore ? R.string.error_show_less : R.string.error_show_more, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2)
{
showError(ctx, titleId, e, exitIfOk, !showMore);
}
})
.setNeutralButton(android.R.string.copy, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface p1, int p2)
{
android.content.ClipboardManager mgr = (android.content.ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE);
mgr.setPrimaryClip(ClipData.newPlainText("error", Log.getStackTraceString(e)));
if(exitIfOk) {
if (ctx instanceof BaseMainActivity) {
BaseMainActivity.fullyExit();
} else {
((Activity) ctx).finish();
}
}
}
})
//.setNegativeButton("Report (not available)", null)
.setCancelable(!exitIfOk)
.show();
System.err.println(sw.toString());
Platform.getPlatform().runOnUIThread(() -> {
WindowAlertController alertController = new WindowAlertController(title, sw.toString(), UIAlertControllerStyle.Alert);
alertController.addAction(new UIAlertAction("OK",
UIAlertActionStyle.Default, (action) -> {
alertController.dismissViewController(true, null);
if (exitIfOk) {
System.exit(0);
}
}
};
if (ctx instanceof Activity) {
((Activity) ctx).runOnUiThread(runnable);
} else {
runnable.run();
}
));
alertController.show();
}
public static void dialogOnUiThread(final Activity ctx, final CharSequence title, final CharSequence message) {