Fix neoforge check, make forge validator more lenient (#928)

modrinth · Jun 14, 2024 · 5148e27 · 5148e27
1 parent 608e55c
commit 5148e27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/validate/forge.rs b/src/validate/forge.rs
@@ -27,6 +27,7 @@ impl super::Validator for ForgeValidator {
         archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
     ) -> Result<ValidationResult, ValidationError> {
         if archive.by_name("META-INF/mods.toml").is_err()
+            && archive.by_name("META-INF/MANIFEST.MF").is_err()
             && !archive.file_names().any(|x| x.ends_with(".class"))
         {
             return Ok(ValidationResult::Warning(
@@ -70,6 +71,7 @@ impl super::Validator for LegacyForgeValidator {
         archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
     ) -> Result<ValidationResult, ValidationError> {
         if archive.by_name("mcmod.info").is_err()
+            && archive.by_name("META-INF/MANIFEST.MF").is_err()
             && !archive.file_names().any(|x| x.ends_with(".class"))
         {
             return Ok(ValidationResult::Warning(

diff --git a/src/validate/neoforge.rs b/src/validate/neoforge.rs
@@ -10,7 +10,7 @@ impl super::Validator for NeoForgeValidator {
     }
 
     fn get_supported_loaders(&self) -> &[&str] {
-        &["forge"]
+        &["neoforge"]
     }
 
     fn get_supported_game_versions(&self) -> SupportedGameVersions {
@@ -23,6 +23,7 @@ impl super::Validator for NeoForgeValidator {
     ) -> Result<ValidationResult, ValidationError> {
         if archive.by_name("META-INF/mods.toml").is_err()
             && archive.by_name("META-INF/neoforge.mods.toml").is_err()
+            && archive.by_name("META-INF/MANIFEST.MF").is_err()
             && !archive.file_names().any(|x| x.ends_with(".class"))
         {
             return Ok(ValidationResult::Warning(