Neoforge support (#653)

This commit is contained in:
Geometrically
2023-08-21 17:39:39 -04:00
committed by GitHub
parent 7bea362503
commit 2d3baff031
14 changed files with 111 additions and 40 deletions

View File

@@ -33,3 +33,11 @@ pub async fn get_quilt_versions() -> crate::Result<Manifest> {
Ok(tags)
}
#[tracing::instrument]
pub async fn get_neoforge_versions() -> crate::Result<Manifest> {
let state = State::get().await?;
let tags = state.metadata.read().await.neoforge.clone();
Ok(tags)
}

View File

@@ -69,6 +69,7 @@ pub enum EnvType {
#[serde(rename_all = "kebab-case")]
pub enum PackDependency {
Forge,
NeoForge,
FabricLoader,
QuiltLoader,
Minecraft,
@@ -323,6 +324,10 @@ pub async fn set_profile_information(
mod_loader = Some(ModLoader::Forge);
loader_version = Some(value);
}
PackDependency::NeoForge => {
mod_loader = Some(ModLoader::NeoForge);
loader_version = Some(value);
}
PackDependency::FabricLoader => {
mod_loader = Some(ModLoader::Fabric);
loader_version = Some(value);

View File

@@ -180,6 +180,7 @@ pub(crate) async fn get_loader_version_from_loader(
ModLoader::Forge => &metadata.forge,
ModLoader::Fabric => &metadata.fabric,
ModLoader::Quilt => &metadata.quilt,
ModLoader::NeoForge => &metadata.neoforge,
_ => {
return Err(
ProfileCreationError::NoManifest(loader.to_string()).into()

View File

@@ -1049,7 +1049,7 @@ fn sanitize_loader_version_string(s: &str, loader: PackDependency) -> &str {
// If two or more, take the second
// If one, take the first
// If none, take the whole thing
PackDependency::Forge => {
PackDependency::Forge | PackDependency::NeoForge => {
let mut split: std::str::Split<'_, char> = s.split('-');
match split.next() {
Some(first) => match split.next() {

View File

@@ -18,6 +18,7 @@ pub struct Metadata {
pub forge: LoaderManifest,
pub fabric: LoaderManifest,
pub quilt: LoaderManifest,
pub neoforge: LoaderManifest,
}
impl Metadata {
@@ -26,7 +27,7 @@ impl Metadata {
}
pub async fn fetch() -> crate::Result<Self> {
let (minecraft, forge, fabric, quilt) = tokio::try_join! {
let (minecraft, forge, fabric, quilt, neoforge) = tokio::try_join! {
async {
let url = Self::get_manifest("minecraft");
fetch_version_manifest(Some(&url)).await
@@ -42,6 +43,10 @@ impl Metadata {
async {
let url = Self::get_manifest("quilt");
fetch_loader_manifest(&url).await
},
async {
let url = Self::get_manifest("neo");
fetch_loader_manifest(&url).await
}
}?;
@@ -50,6 +55,7 @@ impl Metadata {
forge,
fabric,
quilt,
neoforge,
})
}

View File

@@ -205,6 +205,7 @@ pub enum ModLoader {
Forge,
Fabric,
Quilt,
NeoForge,
}
impl std::fmt::Display for ModLoader {
@@ -214,6 +215,7 @@ impl std::fmt::Display for ModLoader {
Self::Forge => "Forge",
Self::Fabric => "Fabric",
Self::Quilt => "Quilt",
Self::NeoForge => "NeoForge",
})
}
}
@@ -225,6 +227,7 @@ impl ModLoader {
Self::Forge => "forge",
Self::Fabric => "fabric",
Self::Quilt => "quilt",
Self::NeoForge => "neoforge",
}
}
}