TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 23:59:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle java exit code

Browse Source
This commit is contained in:
khanhduytran0 2020-10-06 15:28:29 +07:00
parent b61b0f17a4
commit 9741b05dfd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -72,7 +72,8 @@ public final class Tools
public static final int LAUNCH_TYPE = LTYPE_INVOCATION; public static final int LAUNCH_TYPE = LTYPE_INVOCATION;
public static ShellProcessOperation mLaunchShell; public static ShellProcessOperation mLaunchShell;
public static void launchMinecraft(final Activity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable { private static int exitCode = 0;
public static void launchMinecraft(final LoggableActivity ctx, MCProfile.Builder profile, JMinecraftVersionList.Version versionInfo) throws Throwable {
String[] launchArgs = getMinecraftArgs(profile, versionInfo); String[] launchArgs = getMinecraftArgs(profile, versionInfo);
List<String> javaArgList = new ArrayList<String>(); List<String> javaArgList = new ArrayList<String>();
@ -166,22 +167,24 @@ public final class Tools
}); });
*/ */
VMLauncher.launchJVM(javaArgList.toArray(new String[0])); exitCode = VMLauncher.launchJVM(javaArgList.toArray(new String[0]));
ctx.appendlnToLog("Java Exit code: " + exitCode);
} }
} }
ctx.runOnUiThread(new Runnable(){ ctx.runOnUiThread(new Runnable(){
@Override @Override
public void run() { public void run() {
AlertDialog.Builder dialog = new AlertDialog.Builder(ctx); AlertDialog.Builder dialog = new AlertDialog.Builder(ctx);
dialog.setMessage(R.string.mcn_javaexit_title); dialog.setMessage(ctx.getString(R.string.mcn_exit_title, exitCode));
dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){ dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override @Override
public void onClick(DialogInterface p1, int p2){ public void onClick(DialogInterface p1, int p2){
ctx.finish(); MainActivity.fullyExit();
} }
}); });
dialog.show();
} }
}); });
} }

3
app/src/main/res/values/strings.xml
View File

@ -145,8 +145,7 @@
</string> </string>
--> -->
<!-- MainActivity: strings --> <!-- MainActivity: strings -->
<string name="mcn_javaexit_title">Application exited</string> <string name="mcn_exit_title">Application/Game exited with code %s</string>
<string name="mcn_exit_title">Game exited</string>
<string name="mcn_exit_call">Exit</string> <string name="mcn_exit_call">Exit</string>
<string name="mcn_exit_crash">Game Crash detected! Click OK to exit.</string> <string name="mcn_exit_crash">Game Crash detected! Click OK to exit.</string>
<string name="mcn_exit_errcrash">Unable to locate crash! You may ignore this.</string> <string name="mcn_exit_errcrash">Unable to locate crash! You may ignore this.</string>