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

Fix[code]: clearer meanings for some stuff and remove hardcoded -1, -1 for ProgressKeeper

Browse Source
This commit is contained in:
artdeell 2023-10-14 08:17:11 +03:00
parent e6af83b2e2
commit f1ee8f0177
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/DownloadMirror.java
View File

@ -18,12 +18,12 @@ public class DownloadMirror {
public static final int DOWNLOAD_CLASS_METADATA = 1; public static final int DOWNLOAD_CLASS_METADATA = 1;
public static final int DOWNLOAD_CLASS_ASSETS = 2; public static final int DOWNLOAD_CLASS_ASSETS = 2;
private static final String URL_PROTOCOL_TAIL = "://";
private static final String[] MIRROR_BMCLAPI = { private static final String[] MIRROR_BMCLAPI = {
"https://bmclapi2.bangbang93.com/maven", "https://bmclapi2.bangbang93.com/maven",
"https://bmclapi2.bangbang93.com", "https://bmclapi2.bangbang93.com",
"https://bmclapi2.bangbang93.com/assets" "https://bmclapi2.bangbang93.com/assets"
}; };
private static final String[] MIRROR_MCBBS = { private static final String[] MIRROR_MCBBS = {
"https://download.mcbbs.net/maven", "https://download.mcbbs.net/maven",
"https://download.mcbbs.net", "https://download.mcbbs.net",
@ -91,15 +91,14 @@ public class DownloadMirror {
} }
private static int getBaseUrlTail(String wholeUrl) throws MalformedURLException{ private static int getBaseUrlTail(String wholeUrl) throws MalformedURLException{
int protocolNameEnd = wholeUrl.indexOf("://"); int protocolNameEnd = wholeUrl.indexOf(URL_PROTOCOL_TAIL);
if(protocolNameEnd == -1) if(protocolNameEnd == -1)
throw new MalformedURLException("No protocol, or non path-based URL"); throw new MalformedURLException("No protocol, or non path-based URL");
protocolNameEnd += 3; protocolNameEnd += URL_PROTOCOL_TAIL.length();
int hostnameEnd = wholeUrl.indexOf('/', protocolNameEnd); int hostnameEnd = wholeUrl.indexOf('/', protocolNameEnd);
if(protocolNameEnd >= wholeUrl.length() || hostnameEnd == protocolNameEnd) if(protocolNameEnd >= wholeUrl.length() || hostnameEnd == protocolNameEnd)
throw new MalformedURLException("No hostname"); throw new MalformedURLException("No hostname");
if(hostnameEnd == -1) hostnameEnd = wholeUrl.length(); if(hostnameEnd == -1) hostnameEnd = wholeUrl.length();
System.out.println(protocolNameEnd +" "+ hostnameEnd);
return hostnameEnd; return hostnameEnd;
} }
} }

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceJavaFragment.java
View File

@ -27,11 +27,6 @@ public class LauncherPreferenceJavaFragment extends LauncherPreferenceFragment {
if(data != null) Tools.installRuntimeFromUri(getContext(), data); if(data != null) Tools.installRuntimeFromUri(getContext(), data);
}); });
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
}
@Override @Override
public void onCreatePreferences(Bundle b, String str) { public void onCreatePreferences(Bundle b, String str) {
int ramAllocation = LauncherPreferences.PREF_RAM_ALLOCATION; int ramAllocation = LauncherPreferences.PREF_RAM_ALLOCATION;

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

@ -92,7 +92,7 @@ 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(activity != null && !JRE17Util.installNewJreIfNeeded(activity, verInfo)){ if(activity != null && !JRE17Util.installNewJreIfNeeded(activity, verInfo)){
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressLayout.clearProgress(ProgressLayout.DOWNLOAD_MINECRAFT);
throw new DownloaderException(); throw new DownloaderException();
} }
@ -188,11 +188,11 @@ public class AsyncMinecraftDownloader {
} }
} }
} catch (DownloaderException e) { } catch (DownloaderException e) {
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressLayout.clearProgress(ProgressLayout.DOWNLOAD_MINECRAFT);
throw e; throw e;
} 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); ProgressLayout.clearProgress(ProgressLayout.DOWNLOAD_MINECRAFT);
throw new DownloaderException(e); throw new DownloaderException(e);
} }
@ -211,10 +211,10 @@ public class AsyncMinecraftDownloader {
downloadAssets(assets, assets.mapToResources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH)); downloadAssets(assets, assets.mapToResources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH));
} 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); ProgressLayout.clearProgress(ProgressLayout.DOWNLOAD_MINECRAFT);
throw new DownloaderException(e); throw new DownloaderException(e);
} }
ProgressKeeper.submitProgress(ProgressLayout.DOWNLOAD_MINECRAFT, -1, -1); ProgressLayout.clearProgress(ProgressLayout.DOWNLOAD_MINECRAFT);
} }
public void verifyAndDownloadMainJar(String url, String sha1, File destination) throws Exception{ public void verifyAndDownloadMainJar(String url, String sha1, File destination) throws Exception{