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

clean up crafting module item requesting code

Browse source
This commit is contained in:
Ell 2024-12-04 23:25:02 +01:00
parent e31889a690
commit 04baa9577e
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,27 +84,25 @@ public class CraftingModuleItem extends ModuleItem {
if (craft.moduleSlot == slot) { if (craft.moduleSlot == slot) {
network.startProfile("crafting_ingredients"); network.startProfile("crafting_ingredients");
var ingredient = craft.ingredientsToRequest.getFirst(); var ingredient = craft.ingredientsToRequest.getFirst();
var toRequest = ingredient.map(l -> l.stack, s -> s).copy(); var toRequest = ingredient.map(l -> l.stack, s -> s);
var dest = tile.getAvailableDestination(Direction.values(), toRequest, true, true); var dest = tile.getAvailableDestination(Direction.values(), toRequest, true, true);
if (dest != null) { if (dest != null) {
// 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 requested = ingredient.map(l -> { var remain = ingredient.map(l -> {
// we can ignore the return value here since we're using a lock, so we know that the item is already waiting for us there var ret = network.requestExistingItem(l.location, tile.getBlockPos(), dest.getLeft(), l, dest.getRight(), equalityTypes);
network.requestExistingItem(l.location, tile.getBlockPos(), dest.getLeft(), l, dest.getRight(), equalityTypes); if (ret.getCount() != l.stack.getCount())
network.resolveNetworkLock(l); network.resolveNetworkLock(l);
return toRequest;
}, s -> {
var remain = network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes);
var ret = s.copyWithCount(s.getCount() - remain.getCount());
s.setCount(remain.getCount());
return ret; return ret;
}); }, s -> network.requestExistingItem(tile.getBlockPos(), dest.getLeft(), null, dest.getRight(), equalityTypes));
if (!requested.isEmpty()) { // dest may be able to accept less than toRequest, so the amount that remains there also needs to be taken into account
if (toRequest.getCount() - requested.getCount() <= 0) remain.grow(toRequest.getCount() - dest.getRight().getCount());
craft.ingredientsToRequest.remove(ingredient); if (remain.getCount() != dest.getRight().getCount()) {
craft.travelingIngredients.add(requested); if (!remain.isEmpty())
craft.ingredientsToRequest.add(craft.ingredientsToRequest.indexOf(ingredient), Either.right(remain));
craft.ingredientsToRequest.remove(ingredient);
craft.travelingIngredients.add(toRequest.copyWithCount(toRequest.getCount() - remain.getCount()));
craft.inProgress = true; craft.inProgress = true;
} }
} }