fix #34

examples/forge/config/server.properties

@@ -0,0 +1,2 @@
+server-port=${PORT:25565}
+motd=${SERVER_NAME:A Minecraft Server}

examples/forge/server.toml

@@ -0,0 +1,16 @@
+name = "forge"
+mc_version = "1.7.10"
+
+[jar]
+type = "forge"
+loader = "latest"
+
+[variables]
+PORT = "25565"
+
+[launcher]
+eula_args = true
+nogui = true
+preset_flags = "aikars"
+
+[options]

src/sources/forge.rs

@@ -10,6 +10,7 @@ pub static FORGE_FILENAME: &str = "${artifact}-${version}-installer.jar";
 pub struct ForgeAPI<'a>(pub &'a App);
 
 impl<'a> ForgeAPI<'a> {
+    /// Returns a string list of filtered versions, everything after the first dash (-)
     pub async fn fetch_versions(&self) -> Result<Vec<String>> {
         let (_, versions) = self
             .0
@@ -20,10 +21,10 @@ impl<'a> ForgeAPI<'a> {
         Ok(versions
             .iter()
             .filter_map(|s| {
-                let (m, l) = s.split_once('-')?;
+                let v = s.split('-').collect::<Vec<_>>();
 
-                if m == self.0.mc_version() {
-                    Some(l.to_owned())
+                if v[0] == self.0.mc_version() {
+                    Some(v[1].to_owned())
                 } else {
                     None
                 }

src/sources/maven.rs

@@ -156,26 +156,21 @@ impl<'a> MavenAPI<'a> {
         artifact_id: &str,
         version: &str,
     ) -> Result<String> {
-        let fetch_versions = || self.fetch_versions(url, group_id, artifact_id);
+        let (latest, versions) = self.fetch_versions(url, group_id, artifact_id).await?;
 
         let version = match version {
-            "latest" => fetch_versions().await?.0,
+            "latest" => latest,
             id => {
-                if id.contains('$') {
-                    let versions = fetch_versions().await?.1;
-                    let id = id
-                        .replace("${artifact}", artifact_id)
-                        .replace("${mcversion}", &self.0.mc_version())
-                        .replace("${mcver}", &self.0.mc_version());
-                    versions
-                        .iter()
-                        .find(|v| *v == &id)
-                        .or_else(|| versions.iter().find(|v| v.contains(&id)))
-                        .ok_or(anyhow!("Couldn't resolve maven artifact version (url={url},g={group_id},a={artifact_id})"))?
-                        .clone()
-                } else {
-                    id.to_owned()
-                }
+                let id = id
+                    .replace("${artifact}", artifact_id)
+                    .replace("${mcversion}", &self.0.mc_version())
+                    .replace("${mcver}", &self.0.mc_version());
+                versions
+                    .iter()
+                    .find(|v| *v == &id)
+                    .or_else(|| versions.iter().find(|v| v.contains(&id)))
+                    .ok_or(anyhow!("Couldn't resolve maven artifact version (url={url},g={group_id},a={artifact_id})"))?
+                    .clone()
             }
         };