small fixes

This commit is contained in:
Ell 2024-12-05 01:30:48 +01:00
parent 82a885353e
commit 208667d6fc

View file

@ -95,11 +95,11 @@ public class CraftingModuleItem extends ModuleItem {
s -> network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes)).copy(); s -> network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes)).copy();
// 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() != toRequest.getCount()) {
ingredient.ifLeft(network::resolveNetworkLock); ingredient.ifLeft(network::resolveNetworkLock);
craft.ingredientsToRequest.removeFirst();
if (!remain.isEmpty()) if (!remain.isEmpty())
craft.ingredientsToRequest.add(craft.ingredientsToRequest.indexOf(ingredient), Either.right(remain)); craft.ingredientsToRequest.addFirst(Either.right(remain));
craft.ingredientsToRequest.remove(ingredient);
craft.travelingIngredients.add(toRequest.copyWithCount(toRequest.getCount() - remain.getCount())); craft.travelingIngredients.add(toRequest.copyWithCount(toRequest.getCount() - remain.getCount()));
craft.inProgress = true; craft.inProgress = true;
} }