eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Bump versions + switch AWS/S3 library

Browse Source
This commit is contained in:
Jai A
2022-12-22 19:01:41 -07:00
parent 827c4e31ee
commit 45dbf5393f
8 changed files with 90 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daedalus_client/src/minecraft.rs
View File

@@ -8,7 +8,7 @@ use tokio::sync::Mutex;
pub async fn retrieve_data(uploaded_files: &mut Vec<String>) -> Result<VersionManifest, Error> {
let old_manifest =
daedalus::minecraft::fetch_version_manifest(Some(&*crate::format_url(&*format!(
daedalus::minecraft::fetch_version_manifest(Some(&*crate::format_url(&format!(
"minecraft/v{}/manifest.json",
daedalus::minecraft::CURRENT_FORMAT_VERSION
))))
@@ -43,12 +43,12 @@ pub async fn retrieve_data(uploaded_files: &mut Vec<String>) -> Result<VersionMa
let cloned_manifest_mutex = Arc::clone(&cloned_manifest);
let uploaded_files_mutex = Arc::clone(&uploaded_files_mutex);
let assets_hash = old_version.map(|x| x.assets_index_sha1.clone()).flatten();
let assets_hash = old_version.and_then(|x| x.assets_index_sha1.clone());
async move {
let mut upload_futures = Vec::new();
let mut version_info = daedalus::minecraft::fetch_version_info(version).await?;
let version_info = daedalus::minecraft::fetch_version_info(version).await?;
let version_path = format!(
"minecraft/v{}/versions/{}.json",