Refactor inventory util methods #795
Closed
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
zyxkad
requested changes
Nov 19, 2025
| @NotNull | ||
| @Override | ||
| public FluidStack drain(FluidFilter filter, FluidAction simulate) { | ||
| public FluidStack drain(FluidFilter filter, int count, FluidAction simulate) { |
Collaborator
There was a problem hiding this comment.
Better don't change the method signature. Just keep using filter's count.
| if (amount > 0) { | ||
| if (toSlot < -1 || toSlot >= inventoryTo.getChemicalTanks()) | ||
| return 0; | ||
| for (int i = toSlot == -1 ? 0 : toSlot; i < (toSlot == -1 ? inventoryTo.getChemicalTanks() : toSlot + 1); i++) { |
Collaborator
There was a problem hiding this comment.
eh tbh this implementation did not fulfill me, I'll make a fix later.
Contributor
Build PreviewYou can find files attached to the below linked Workflow Run URL (Logs).
|
Member
|
I guess this can be closed due to #796 796 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
What kind of change does this PR introduce? (Bug fix, feature, ...)
Fix for ME bridge
importFluidmethod can only import from first slot #794 , and a few other me/rs bridge method bugsWhat is the current behavior? (You can also link to an open issue here)
see issue above, also some cases where it under/over exports/imports items
explained a bit here in the discord https://discord.com/channels/734726882058174486/779400553813377074/1440567741634445383
What is the new behavior (if this is a feature change)?
n/a
Does this PR introduce a breaking change? (What changes might users need to make in their scripts due to this PR?)
There may be slight differences in the way it moves items, like some items may be able to transfer it didn't before, some ordering changed, but i doubt it would cause that big of a problem
Other information:
Some testing have been done for the item and fluid methods, although a bit more review might be needed
Also haven't tested the mechanism chemical stuff yet, mostly due to the fact that i have no idea how that mod works, might want to test that too
This is almost a complete refactor of the methods so there may be new bugs
Also need to port this to 1.20 and other supported versions too probably, although shouldn't be that difficult, the changed code looks quite similar