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

Fix wrong word, fix OptiFine installer crash.

Browse Source
This commit is contained in:
khanhduytran0 2020-05-05 09:12:34 +07:00
parent 8ef9e2f4e6
commit 0f76135da8
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java
View File

@ -428,6 +428,17 @@ public class MCLauncherActivity extends AppCompatActivity
super.onBackPressed();
}
}
// Catching touch exception
@Override
public boolean onTouchEvent(MotionEvent event) {
try {
return super.onTouchEvent(event);
} catch (Throwable th) {
Tools.showError(this, th);
return false;
}
}
private GameRunnerTask mTask;
@ -966,7 +977,7 @@ public class MCLauncherActivity extends AppCompatActivity
super.onPreExecute();
dialog = new ProgressDialog(MCLauncherActivity.this);
dialog.setTitle("Installing OptiFine");
dialog.setMessage("Prepaping");
dialog.setMessage("Preparing");
dialog.setMax(5);
dialog.setCancelable(false);
dialog.show();
@ -992,12 +1003,12 @@ public class MCLauncherActivity extends AppCompatActivity
Throwable throwable = null;
File convertedFile = null;
try {
publishProgress("Prepaping", "5");
publishProgress("Preparing", "5");
String origMd5 = OptiFinePatcher.calculateMD5(file[0]);
convertedFile = new File(Tools.optifineDir, origMd5 + ".jar");
if (!convertedFile.exists()) {
publishProgress("Patching OptiFine Installer", null, "1", "ADD");
publishProgress("Patching OptiFine Installer", null, "1", "true");
Tools.extractAssetFolder(MCLauncherActivity.this, "optifine_patch", Tools.optifineDir, true);
@ -1006,7 +1017,7 @@ public class MCLauncherActivity extends AppCompatActivity
String[] output = Tools.patchOptifineInstaller(MCLauncherActivity.this, file[0]);
File patchedFile = new File(output[1]);
publishProgress("Converting OptiFine", null, null, Integer.toString(ProgressDialog.STYLE_SPINNER));
publishProgress("Converting OptiFine", null, null, "false");
System.setOut(new PrintStream(logOut));
System.setErr(new PrintStream(logErr));
@ -1028,7 +1039,7 @@ public class MCLauncherActivity extends AppCompatActivity
patchedFile.delete();
}
publishProgress("Launching OptiFine installer", null, null, Integer.toString(ProgressDialog.STYLE_SPINNER));
publishProgress("Launching OptiFine installer", null, null, "true");
File optDir = getDir("dalvik-cache", 0);
optDir.mkdir();
@ -1074,12 +1085,12 @@ public class MCLauncherActivity extends AppCompatActivity
protected void onProgressUpdate(String[] text) {
super.onProgressUpdate(text);
dialog.setMessage(text[0]);
if (text.length >= 2 && text[1] != null) {
if (text.length > 1 && text[1] != null) {
dialog.setMax(Integer.valueOf(text[1]));
} if (text.length >= 3) {
} if (text.length > 2) {
dialog.setProgress(dialog.getProgress() + 1);
} if (text.length >= 4) {
dialog.setProgressStyle(Integer.parseInt(text[3]));
} if (text.length > 3 && text[3] != null) {
dialog.setIndeterminate(Boolean.getBoolean(text[3]));
}
}

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

@ -81,7 +81,7 @@
<string name="mcl_launch_convert_lib">Converting library %s</string>
<string name="mcl_launch_convert_client">Converting Minecraft %s</string>
<string name="mcl_launch_patch_client">Patching Minecraft %s</string>
<string name="mcl_launch_download_assets">Prepaping to download resources</string>
<string name="mcl_launch_download_assets">Preparing to download resources</string>
<string name="mcl_options">Options</string>
<string name="mcl_option_modmgr">Mod manager (no function)</string>