Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-12-22 07:29:24 +01:00
Code Issues Projects Releases Wiki Activity

only resolve network locks if the items actually changed

Browse source
This commit is contained in:
Ell 2024-12-05 00:25:07 +01:00
parent 04baa9577e
commit 82a885353e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleItem.java
View file

@ -90,15 +90,13 @@ public class CraftingModuleItem extends ModuleItem {
// if we're ensuring the correct item order and the item is already on the way, don't do anything yet // if we're ensuring the correct item order and the item is already on the way, don't do anything yet
if (module.get(Contents.TYPE).insertionType != InsertionType.PER_ITEM || craft.travelingIngredients.isEmpty()) { if (module.get(Contents.TYPE).insertionType != InsertionType.PER_ITEM || craft.travelingIngredients.isEmpty()) {
var equalityTypes = ItemFilter.getEqualityTypes(tile); var equalityTypes = ItemFilter.getEqualityTypes(tile);
var remain = ingredient.map(l -> { var remain = ingredient.map(
var ret = network.requestExistingItem(l.location, tile.getBlockPos(), dest.getLeft(), l, dest.getRight(), equalityTypes); l -> network.requestExistingItem(l.location, tile.getBlockPos(), dest.getLeft(), l, dest.getRight(), equalityTypes),
if (ret.getCount() != l.stack.getCount()) s -> network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes)).copy();
network.resolveNetworkLock(l);
return ret;
}, s -> network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes));
// dest may be able to accept less than toRequest, so the amount that remains there also needs to be taken into account // dest may be able to accept less than toRequest, so the amount that remains there also needs to be taken into account
remain.grow(toRequest.getCount() - dest.getRight().getCount()); remain.grow(toRequest.getCount() - dest.getRight().getCount());
if (remain.getCount() != dest.getRight().getCount()) { if (remain.getCount() != dest.getRight().getCount()) {
ingredient.ifLeft(network::resolveNetworkLock);
if (!remain.isEmpty()) if (!remain.isEmpty())
craft.ingredientsToRequest.add(craft.ingredientsToRequest.indexOf(ingredient), Either.right(remain)); craft.ingredientsToRequest.add(craft.ingredientsToRequest.indexOf(ingredient), Either.right(remain));
craft.ingredientsToRequest.remove(ingredient); craft.ingredientsToRequest.remove(ingredient);