Improve the recipe function #218
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
- The `recipeFunction` now uses `SlotMatchResult#getGivenInput` instead of `SlotMatchResult#getRecipeIngredient` to get the inputs. - Implemented `InputList` with `.getAt()` `.findMarked()` and `findMarkedOrEmpty()` methods to get the mark. - Changed the `inputs` parameter of the function to `InputList` type. - `IIngredient` now implements `IMarkable`. - Renamed both `ItemStackMixin#getMark` & `ItemStackMixin#setMark` methods to `ItemStackMixin#grs$getMark` & `ItemStackMixin#grs$setMark`. `.getMark()` & `.setMark()` are now part of `ItemStackMixinExpansion`.
WaitingIdly
reviewed
Aug 10, 2024
src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipe.java
Outdated
Show resolved
Hide resolved
src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipe.java
Show resolved
Hide resolved
src/main/java/com/cleanroommc/groovyscript/compat/vanilla/CraftingRecipe.java
Outdated
Show resolved
Hide resolved
brachy84
requested changes
Aug 10, 2024
There was a problem hiding this comment.
In this pr you assume that the givenInput can have a mark, which is not true. The given input is the same item from the current crafting grid, which is never marked. The mark only exists on the input ingredients of the recipe and not the actual matched items. So your example shouldnt even work
src/main/java/com/cleanroommc/groovyscript/api/IIngredient.java
Outdated
Show resolved
Hide resolved
|
Nevermind what i said |
brachy84
approved these changes
Aug 14, 2024
WaitingIdly
approved these changes
Aug 15, 2024
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.
The
recipeFunctionnow usesSlotMatchResult#getGivenInputinstead ofSlotMatchResult#getRecipeIngredientto get the inputs.Implemented
InputListwith.getAt().findMarked()andfindMarkedOrEmpty()methods to get the mark.Changed the
inputsparameter of the function toInputListtype.IIngredientnow implementsIMarkable.Renamed both
ItemStackMixin#getMark&ItemStackMixin#setMarkmethods toItemStackMixin#grs$getMark&ItemStackMixin#grs$setMark..getMark()&.setMark()are now part ofItemStackMixinExpansion.