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

Monetization status, additional files fix, deps fix (#574)

Browse Source
This commit is contained in:
Geometrically
2023-04-16 20:03:53 -07:00
committed by GitHub
parent 95ae981698
commit a560f6e9f6
26 changed files with 1208 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/validate/shader.rs
View File

@@ -28,8 +28,8 @@ impl super::Validator for ShaderValidator {
archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
) -> Result<ValidationResult, ValidationError> {
if !archive.file_names().any(|x| x.starts_with("shaders/")) {
return Err(ValidationError::InvalidInput(
"No shaders folder present for OptiFine/Iris shader.".into(),
return Ok(ValidationResult::Warning(
"No shaders folder present for OptiFine/Iris shader.",
));
}
@@ -60,15 +60,15 @@ impl super::Validator for CanvasShaderValidator {
&self,
archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
) -> Result<ValidationResult, ValidationError> {
archive.by_name("pack.mcmeta").map_err(|_| {
ValidationError::InvalidInput(
"No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!".into(),
)
})?;
if archive.by_name("pack.mcmeta").is_err() {
return Ok(ValidationResult::Warning(
"No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
));
};
if !archive.file_names().any(|x| x.contains("/pipelines/")) {
return Err(ValidationError::InvalidInput(
"No pipeline shaders folder present for canvas shaders.".into(),
return Ok(ValidationResult::Warning(
"No pipeline shaders folder present for canvas shaders.",
));
}
@@ -99,18 +99,18 @@ impl super::Validator for CoreShaderValidator {
&self,
archive: &mut ZipArchive<Cursor<bytes::Bytes>>,
) -> Result<ValidationResult, ValidationError> {
archive.by_name("pack.mcmeta").map_err(|_| {
ValidationError::InvalidInput(
"No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!".into(),
)
})?;
if archive.by_name("pack.mcmeta").is_err() {
return Ok(ValidationResult::Warning(
"No pack.mcmeta present for pack file. Tip: Make sure pack.mcmeta is in the root directory of your pack!",
));
};
if !archive
.file_names()
.any(|x| x.starts_with("assets/minecraft/shaders/"))
{
return Err(ValidationError::InvalidInput(
"No shaders folder present for vanilla shaders.".into(),
return Ok(ValidationResult::Warning(
"No shaders folder present for vanilla shaders.",
));
}