Prevent the cookery from keeping all empty bottles #10367
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
marchermans
previously approved these changes
Nov 19, 2024
# Conflicts: # src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkDeliveryman.java
Raycoms
reviewed
May 10, 2025
| * The itemstack to filter for this specific pickup. | ||
| */ | ||
| @Nullable | ||
| private List<ItemStack> pickupFilter; |
There was a problem hiding this comment.
We should just initiate this with an empty list to simplify the rest of the logic.
Raycoms
reviewed
May 10, 2025
| { | ||
| super(priority); | ||
| if (filter != null) | ||
| { | ||
| this.pickupFilter = filter.stream().map(ItemStack::copy).collect(Collectors.toList()); |
There was a problem hiding this comment.
we can just use empty list instead and then avoid the nullable. Why do we need a deep copy?
Raycoms
reviewed
May 10, 2025
| @@ -464,6 +464,11 @@ protected IAIState craft() | |||
| module.improveRecipe(currentRecipeStorage, job.getCraftCounter(), worker.getCitizenData()); | |||
| } | |||
|
|
|||
| if (!currentRecipeStorage.getSecondaryOutputs().isEmpty()) | |||
| { | |||
| building.createPickupRequest(10, currentRecipeStorage.getSecondaryOutputs()); | |||
There was a problem hiding this comment.
This indicates that it's not a pickup filter, but instead it's sort of a specific pickup request".
Raycoms
reviewed
May 10, 2025
| final ItemStack activeStack = handler.extractItem(currentSlot, filter.getCount(), false); | ||
| transferItemForPickup(activeStack); | ||
| if (filter.getCount() == activeStack.getCount()) | ||
| { |
There was a problem hiding this comment.
Feels weird to be iterator based. Can't we just make this a if pickupList.contains(new ItemStorage(stackInCurrentSlot)?
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.
Closes #10360
Changes proposed in this pull request
This way crafters can tell couriers to pick up all secondary outputs of the crafter.
Testing
Review please