Fix custom ingredient serialization with allowEmpty #3389
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
apple502j
reviewed
Oct 24, 2023
...recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
Show resolved
Hide resolved
modmuss50
approved these changes
Oct 24, 2023
| } | ||
|
|
||
| // Decode/encode the first codec, if that fails return the result of the second. | ||
| record First<T>(Codec<T> first, Codec<T> second) implements Codec<T> { |
There was a problem hiding this comment.
Nice to get rid of this, thanks ;)
...e-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java
Outdated
Show resolved
Hide resolved
apple502j
approved these changes
Oct 25, 2023
modmuss50
pushed a commit
that referenced
this pull request
Nov 2, 2023
* Fix custom ingredient serialization with allowEmpty * Remove custom First codec * Fix checkstyle (cherry picked from commit 6ed720c)
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.
@jaredlll08 told me that custom ingredients did not serialize correctly with the
allowEmptycodec. This is because the serialization code in our modified codec actually tried to serialize using the vanilla codec first, which fails when the ingredient is empty ifallowEmptyis false but succeeds ifallowEmptyis true, thus writing an empty array[]. I rewrote this using aneithercodec, cleaning up the code a bit and fixing the bug.