Make version fetching more reliable

Author: morr0ne

src/manifest.rs

@@ -82,6 +82,8 @@ impl Manifest {
         async fn process_items<P: AsRef<Path> + Send + 'static>(
             client: Client,
             items: HashMap<String, Definition>,
+            minecraft: &str,
+            loaders: &HashMap<Loader, String>,
             path: P,
             mp: MultiProgress,
             total_pb: ProgressBar,
@@ -102,10 +104,14 @@ impl Manifest {
                     pb.set_message(format!("Processing {}", name));
 
                     let total_pb = total_pb.clone();
+                    let minecraft = minecraft.to_string();
+                    let loaders = loaders.clone();
 
                     task::spawn(async move {
                         let Definition { version, side } = definition;
-                        let version = client.get_version(&name, &version).await?;
+                        let version = client
+                            .get_version(&name, &minecraft, &loaders, &version)
+                            .await?;
                         let mut files = Vec::new();
 
                         for file in version.files {
@@ -148,20 +154,26 @@ impl Manifest {
             process_items(
                 client.clone(),
                 self.mods,
+                &self.enviroment.minecraft,
+                &self.enviroment.loaders,
                 "mods",
                 mp.clone(),
                 total_pb.clone()
             ),
             process_items(
                 client.clone(),
                 self.resource_packs,
+                &self.enviroment.minecraft,
+                &self.enviroment.loaders,
                 "resourcepacks",
                 mp.clone(),
                 total_pb.clone()
             ),
             process_items(
                 client.clone(),
                 self.shaders,
+                &self.enviroment.minecraft,
+                &self.enviroment.loaders,
                 "shaderpacks",
                 mp.clone(),
                 total_pb.clone()

src/modrinth.rs

@@ -156,18 +156,23 @@ impl Client {
         Ok(res)
     }
 
-    pub async fn get_version(&self, project: &str, version: &str) -> Result<Version> {
-        let res = self
-            .http_client
-            .get(format!(
-                "https://api.modrinth.com/v2/project/{project}/version/{version}"
-            ))
-            .send()
-            .await?
-            .json()
+    pub async fn get_version(
+        &self,
+        project: &str,
+        minecraft: &str,
+        loaders: &HashMap<Loader, String>,
+        version: &str,
+    ) -> Result<Version> {
+        let versions = self
+            .get_project_versions(project, minecraft, loaders)
             .await?;
 
-        Ok(res)
+        let version = versions
+            .into_iter()
+            .find(|v| v.version_number == version)
+            .expect("Failed to find a valid version");
+
+        Ok(version)
     }
 
     pub async fn get_project(&self, project: &str) -> Result<Project> {