Support for recipes with empty output #1701
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TechLord22
reviewed
Apr 20, 2023
| @@ -328,8 +336,9 @@ protected ValidationResult<Recipe> postValidateRecipe(@Nonnull ValidationResult< | |||
| } | |||
| recipeStatus = EnumValidationResult.INVALID; | |||
| } | |||
| boolean emptyOutputs = recipe.getOutputs().isEmpty() && recipe.getFluidOutputs().isEmpty() && recipe.getChancedOutputs().isEmpty(); | |||
| if (recipe.getEUt() > 0 && emptyOutputs) { | |||
| boolean emptyOutputs = !this.allowEmptyOutput && recipe.getEUt() > 0 && | |||
There was a problem hiding this comment.
Should the negative EUt check be removed now in order to require enabling empty outputs?
There was a problem hiding this comment.
I left the negative EU checks to preserve add-on compatibility. It probably should be removed in the future, hopefully together with #1651.
TechLord22
approved these changes
Apr 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
This PR adds an extra flag in
RecipeMapto enable creation of recipemaps with empty outputs allowed.Implementation Details
Recipes with empty outputs are not allowed by default. The exceptions were for fuel recipes, which is checked with hardcoded convention of negative EU/t indicating the recipe is a fuel recipe.
In this PR, a new flag,
allowEmptyOutput, is added toRecipeMap. Setting the flag totruemakes empty output check to be bypassed during recipe validation. There's no option of un-setting the flag.Additionally, I've removed the check right below empty output check, as it is already checked by above statements and does not affect the actual validation result.
The other changes are just minor documentation changes and cleanups.
Outcome
Addons may be able to
Additional Information
To retain compatibility, the negative EU/t is still explicitly checked. We should remove the check after giving some time for users to migrate to
allowEmptyOutputflag.Potential Compatibility Issues
None