eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Geometrically
2024-06-14 13:16:05 -07:00
committed by GitHub
parent 608e55c01f
commit 5148e27448
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/validate/forge.rs
View File

@@ -27,6 +27,7 @@ impl super::Validator for ForgeValidator {
archive: &mut ZipArchive<Cursor<bytes::Bytes>>, archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
) -> Result<ValidationResult, ValidationError> { ) -> Result<ValidationResult, ValidationError> {
if archive.by_name("META-INF/mods.toml").is_err() 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")) && !archive.file_names().any(|x| x.ends_with(".class"))
{ {
return Ok(ValidationResult::Warning( return Ok(ValidationResult::Warning(
@@ -70,6 +71,7 @@ impl super::Validator for LegacyForgeValidator {
archive: &mut ZipArchive<Cursor<bytes::Bytes>>, archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
) -> Result<ValidationResult, ValidationError> { ) -> Result<ValidationResult, ValidationError> {
if archive.by_name("mcmod.info").is_err() 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")) && !archive.file_names().any(|x| x.ends_with(".class"))
{ {
return Ok(ValidationResult::Warning( return Ok(ValidationResult::Warning(

3
src/validate/neoforge.rs
View File

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