Update Improve exact choice recipe ingredients#13788
Open
Biquaternions wants to merge 2 commits intoPaperMC:mainfrom
Open
Update Improve exact choice recipe ingredients#13788Biquaternions wants to merge 2 commits intoPaperMC:mainfrom
Biquaternions wants to merge 2 commits intoPaperMC:mainfrom
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR updates the last remaining feature patch to 26.1
I'd personally pay close attention to the following two parts when reviewing this PR:
io.papermc.paper.inventory.recipe.ItemOrExact#getMaxStackSizenet.minecraft.world.item.crafting.Ingredient#displayAs for 1, I took the code from
net.minecraft.world.item.Item#getDefaultMaxStackSize, which is how vanilla is handling the max stack size now.As for 2, the record constructor
net.minecraft.world.item.crafting.display.SlotDisplay.ItemStackSlotDisplayno longer expects anItemStack, but anItemStackTemplateinstead. I took as reference the code atorg.bukkit.craftbukkit.inventory.CraftItemStack#asTemplate. In theory itemstacks at this point in the code should not be empty. An alternative approach would be to useSlotDisplay.ItemSlotDisplayinstead should that be a concern, or create a helper method that creates templates considering the possibility of empty items.