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

Rename ControlledDownloaderException and fix comment

Browse Source
This commit is contained in:
artdeell 2023-01-25 20:46:59 +03:00
parent 35c01793a5
commit 9459bb8d24
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java
View File

@ -20,7 +20,6 @@ import net.kdt.pojavlaunch.extra.ExtraConstants;
import net.kdt.pojavlaunch.extra.ExtraCore; import net.kdt.pojavlaunch.extra.ExtraCore;
import net.kdt.pojavlaunch.prefs.LauncherPreferences; import net.kdt.pojavlaunch.prefs.LauncherPreferences;
import net.kdt.pojavlaunch.progresskeeper.ProgressKeeper; import net.kdt.pojavlaunch.progresskeeper.ProgressKeeper;
import net.kdt.pojavlaunch.services.ProgressService;
import net.kdt.pojavlaunch.utils.DownloadUtils; import net.kdt.pojavlaunch.utils.DownloadUtils;
import net.kdt.pojavlaunch.value.DependentLibrary; import net.kdt.pojavlaunch.value.DependentLibrary;
import net.kdt.pojavlaunch.value.MinecraftClientInfo; import net.kdt.pojavlaunch.value.MinecraftClientInfo;
@ -52,13 +51,13 @@ public class AsyncMinecraftDownloader {
try { try {
downloadGame(activity, version, realVersion); downloadGame(activity, version, realVersion);
listener.onDownloadDone(); listener.onDownloadDone();
}catch (ControlledDownloaderException e) { }catch (DownloaderException e) {
listener.onDownloadFailed(e.getCause()); listener.onDownloadFailed(e.getCause());
} }
}); });
} }
/* we do the throws DownloaderException thing to avoid blanket-catching Exception as a form of anti-lazy-developer protection */
private void downloadGame(@NonNull Activity activity, JMinecraftVersionList.Version verInfo, String versionName) throws ControlledDownloaderException /* we do this to avoid blanket-catching Exception as a form of anti-lazy-developer protection */{ private void downloadGame(@NonNull Activity activity, JMinecraftVersionList.Version verInfo, String versionName) throws DownloaderException {
final String downVName = "/" + versionName + "/" + versionName; final String downVName = "/" + versionName + "/" + versionName;
//Downloading libraries //Downloading libraries
@ -90,14 +89,14 @@ public class AsyncMinecraftDownloader {
// THIS one function need the activity in the case of an error // THIS one function need the activity in the case of an error
if(!JRE17Util.installNewJreIfNeeded(activity, verInfo)){ if(!JRE17Util.installNewJreIfNeeded(activity, verInfo)){
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1);
throw new ControlledDownloaderException(); throw new DownloaderException();
} }
try { try {
assets = downloadIndex(verInfo, new File(Tools.ASSETS_PATH, "indexes/" + verInfo.assets + ".json")); assets = downloadIndex(verInfo, new File(Tools.ASSETS_PATH, "indexes/" + verInfo.assets + ".json"));
} catch (IOException e) { } catch (IOException e) {
Log.e("AsyncMcDownloader", e.toString(), e); Log.e("AsyncMcDownloader", e.toString(), e);
throw new ControlledDownloaderException(e); throw new DownloaderException(e);
} }
File outLib; File outLib;
@ -186,7 +185,7 @@ public class AsyncMinecraftDownloader {
} catch (Throwable e) { } catch (Throwable e) {
Log.e("AsyncMcDownloader", e.toString(),e ); Log.e("AsyncMcDownloader", e.toString(),e );
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1);
throw new ControlledDownloaderException(e); throw new DownloaderException(e);
} }
ProgressLayout.setProgress(ProgressLayout.DOWNLOAD_MINECRAFT, 0, R.string.mcl_launch_cleancache); ProgressLayout.setProgress(ProgressLayout.DOWNLOAD_MINECRAFT, 0, R.string.mcl_launch_cleancache);
@ -204,7 +203,7 @@ public class AsyncMinecraftDownloader {
} catch (Exception e) { } catch (Exception e) {
Log.e("AsyncMcDownloader", e.toString(), e); Log.e("AsyncMcDownloader", e.toString(), e);
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1);
throw new ControlledDownloaderException(e); throw new DownloaderException(e);
} }
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1);
} }
@ -404,9 +403,9 @@ public class AsyncMinecraftDownloader {
void onDownloadFailed(Throwable throwable); void onDownloadFailed(Throwable throwable);
} }
public static class ControlledDownloaderException extends Exception { private static class DownloaderException extends Exception {
public ControlledDownloaderException() {} public DownloaderException() {}
public ControlledDownloaderException(Throwable e) { public DownloaderException(Throwable e) {
super(e); super(e);
} }
} }