From a5195920fa9e2e1d3ada5084e67272f183269a25 Mon Sep 17 00:00:00 2001 From: Geometrically <18202329+Geometrically@users.noreply.github.com> Date: Tue, 8 Aug 2023 14:27:38 -0700 Subject: [PATCH] update validators (#678) --- src/validate/forge.rs | 24 +++++------------------- src/validate/quilt.rs | 9 --------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/validate/forge.rs b/src/validate/forge.rs index 9aee2226..9740156c 100644 --- a/src/validate/forge.rs +++ b/src/validate/forge.rs @@ -30,19 +30,11 @@ impl super::Validator for ForgeValidator { &self, archive: &mut ZipArchive>, ) -> Result { - if archive.by_name("META-INF/mods.toml").is_err() { - return Ok(ValidationResult::Warning( - "No mods.toml present for Forge file.", - )); - } - - if !archive.file_names().any(|name| name.ends_with(".class")) { - return Ok(ValidationResult::Warning( - "Forge mod file is a source file!", - )); - } - - //TODO: Check if file is a dev JAR? + // if archive.by_name("META-INF/mods.toml").is_err() { + // return Ok(ValidationResult::Warning( + // "No mods.toml present for Forge file.", + // )); + // } Ok(ValidationResult::Pass) } @@ -87,12 +79,6 @@ impl super::Validator for LegacyForgeValidator { )); }; - if !archive.file_names().any(|name| name.ends_with(".class")) { - return Ok(ValidationResult::Warning( - "Forge mod file is a source file!", - )); - } - //TODO: Check if file is a dev JAR? Ok(ValidationResult::Pass) diff --git a/src/validate/quilt.rs b/src/validate/quilt.rs index 2e3164e9..ddb885f5 100644 --- a/src/validate/quilt.rs +++ b/src/validate/quilt.rs @@ -35,15 +35,6 @@ impl super::Validator for QuiltValidator { )); } - if !archive - .file_names() - .any(|name| name.ends_with("refmap.json") || name.ends_with(".class")) - { - return Ok(ValidationResult::Warning( - "Quilt mod file is a source file!", - )); - } - Ok(ValidationResult::Pass) } }