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

Refactor JAssets.java

Browse Source
This commit is contained in:
SerpentSpirale 2022-02-26 16:08:37 +01:00 committed by ArtDev
parent 0625ce60d7
commit b9c4723fee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java
View File

@ -3,7 +3,7 @@ package net.kdt.pojavlaunch;
import java.util.Map; import java.util.Map;
public class JAssets { public class JAssets {
public boolean map_to_resources; public boolean mapToResources;
public Map<String, JAssetInfo> objects; public Map<String, JAssetInfo> objects;
} }

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloaderTask.java
View File

@ -256,7 +256,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
setMax(assets.objects.size()); setMax(assets.objects.size());
zeroProgress(); zeroProgress();
try { try {
downloadAssets(assets, verInfo.assets, assets.map_to_resources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH)); downloadAssets(assets, verInfo.assets, assets.mapToResources ? new File(Tools.OBSOLETE_RESOURCES_PATH) : new File(Tools.ASSETS_PATH));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -440,7 +440,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
JAssetInfo asset = assetsObjects.get(assetKey); JAssetInfo asset = assetsObjects.get(assetKey);
assetsSizeBytes+=asset.size; assetsSizeBytes+=asset.size;
String assetPath = asset.hash.substring(0, 2) + "/" + asset.hash; String assetPath = asset.hash.substring(0, 2) + "/" + asset.hash;
File outFile = assets.map_to_resources?new File(objectsDir,"/"+assetKey):new File(objectsDir, assetPath); File outFile = assets.mapToResources ?new File(objectsDir,"/"+assetKey):new File(objectsDir, assetPath);
boolean skip = outFile.exists();// skip if the file exists boolean skip = outFile.exists();// skip if the file exists
if(LauncherPreferences.PREF_CHECK_LIBRARY_SHA) //if sha checking is enabled if(LauncherPreferences.PREF_CHECK_LIBRARY_SHA) //if sha checking is enabled
if(skip) skip = Tools.compareSHA1(outFile, asset.hash); //check hash if(skip) skip = Tools.compareSHA1(outFile, asset.hash); //check hash
@ -450,7 +450,7 @@ public class MinecraftDownloaderTask extends AsyncTask<String, String, Throwable
if(outFile.exists()) publishProgress("0",mActivity.getString(R.string.dl_library_sha_fail,assetKey)); if(outFile.exists()) publishProgress("0",mActivity.getString(R.string.dl_library_sha_fail,assetKey));
executor.execute(()->{ executor.execute(()->{
try { try {
if (!assets.map_to_resources) { if (!assets.mapToResources) {
downloadAsset(asset, objectsDir, downloadedSize); downloadAsset(asset, objectsDir, downloadedSize);
} else { } else {
downloadAssetMapped(asset, assetKey, outputDir, downloadedSize); downloadAssetMapped(asset, assetKey, outputDir, downloadedSize);