Merge pull request #120 from Not-A-Normal-Robot/inline-mcapi

Inline mcapi code into main branch

Author: deniz-blue

Cargo.lock

@@ -46,7 +46,6 @@ glob = "0.3"
 hex = "0.4"
 indexmap = "2.1"
 indicatif = "0.18"
-mcapi = { git = "https://github.com/ParadigmMC/mcapi.git" }
 md-5 = "0.10"
 notify-debouncer-full = { version = "0.3" }
 opener = "0.8"
@@ -78,6 +77,8 @@ tokio-util = { version = "0.7", features = ["io"] }
 toml = "0.9"
 walkdir = "2.4"
 zip = "0.6"
+lazy_static = "1.5.0"
+thiserror = "2.0.17"
 
 [features]
 autocomplete = ["clap_complete"]

Cargo.toml

@@ -9,7 +9,7 @@ use pathdiff::diff_paths;
 use tokio::fs;
 use walkdir::WalkDir;
 
-use crate::model::BootstrappedFile;
+use crate::{model::BootstrappedFile, util::dollar_repl};
 
 use super::BuildContext;
 
@@ -230,7 +230,7 @@ impl BuildContext<'_> {
     }
 
     pub fn bootstrap_content(&self, content: &str) -> String {
-        mcapi::dollar_repl(content, |k| {
+        dollar_repl(content, |k| {
             let k = k.trim();
 
             let (k, def) = if let Some((k, def)) = k.split_once(':') {

src/core/bootstrap.rs

@@ -294,13 +294,12 @@ impl MarkdownAPI<'_> {
             }
 
             Downloadable::Hangar { id, version } => {
-                let proj = mcapi::hangar::fetch_project(&self.0.http_client, id).await?;
+                let proj = crate::sources::hangar::fetch_project(&self.0.http_client, id).await?;
 
                 (
                     format!(
                         "[{}](https://hangar.papermc.io/{})",
-                        proj.name,
-                        proj.namespace.to_string()
+                        proj.name, proj.namespace
                     ),
                     sanitize(&proj.description)?,
                     version.clone(),

src/interop/markdown.rs

@@ -9,6 +9,8 @@ use std::{
 use anyhow::{anyhow, bail, Result};
 use serde::{Deserialize, Serialize};
 
+use crate::util::dollar_repl;
+
 use super::{ClientSideMod, Downloadable, Hook, ServerLauncher, ServerType, World};
 
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
@@ -140,7 +142,7 @@ impl Server {
     }
 
     pub fn format(&self, str: &str) -> String {
-        mcapi::dollar_repl(str, |key| match key {
+        dollar_repl(str, |key| match key {
             "mcver" | "mcversion" | "SERVER_VERSION" => Some(self.mc_version.clone()),
             "SERVER_NAME" => Some(self.name.clone()),
             k => self.variables.get(k).cloned(),

src/model/servertoml.rs

@@ -1,15 +1,53 @@
 use std::{borrow::Cow, collections::HashMap};
 
+use crate::app::{App, CacheStrategy, ResolvedFile};
 use anyhow::{anyhow, Result};
-use mcapi::fabric::{FabricInstaller, FabricLoader, FABRIC_META_URL};
+use serde::{Deserialize, Serialize};
 
-use crate::app::{App, CacheStrategy, ResolvedFile};
+pub const FABRIC_META_URL: &str = "https://meta.fabricmc.net";
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct FabricLoader {
+    pub separator: String,
+    pub build: u64,
+    pub maven: String,
+    pub version: String,
+    pub stable: bool,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct FabricInstaller {
+    pub url: String,
+    pub maven: String,
+    pub version: String,
+    pub stable: bool,
+}
+
+pub async fn fetch_loaders(client: &reqwest::Client) -> Result<Vec<FabricLoader>> {
+    Ok(client
+        .get(FABRIC_META_URL.to_owned() + "/v2/versions/loader")
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?)
+}
+
+pub async fn fetch_installers(client: &reqwest::Client) -> Result<Vec<FabricInstaller>> {
+    Ok(client
+        .get(FABRIC_META_URL.to_owned() + "/v2/versions/installer")
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?)
+}
 
 pub struct FabricAPI<'a>(pub &'a App);
 
 impl FabricAPI<'_> {
     pub async fn fetch_loaders(&self) -> Result<Vec<FabricLoader>> {
-        Ok(mcapi::fabric::fetch_loaders(&self.0.http_client).await?)
+        fetch_loaders(&self.0.http_client).await
     }
 
     pub async fn fetch_latest_loader(&self) -> Result<String> {
@@ -23,7 +61,7 @@ impl FabricAPI<'_> {
     }
 
     pub async fn fetch_installers(&self) -> Result<Vec<FabricInstaller>> {
-        Ok(mcapi::fabric::fetch_installers(&self.0.http_client).await?)
+        fetch_installers(&self.0.http_client).await
     }
 
     pub async fn fetch_latest_installer(&self) -> Result<String> {