small refactor

Ellpeck · Nov 27, 2024 · 805393b · 805393b
1 parent 2c8ab9e
commit 805393b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleItem.java b/src/main/java/de/ellpeck/prettypipes/pipe/modules/craft/CraftingModuleItem.java
@@ -328,6 +328,17 @@ public ItemStack getTravelingIngredient(ItemStack stack, ItemEquality... equalit
             return ItemStack.EMPTY;
         }
 
+        public boolean markCanceledOrResolve(PipeNetwork network) {
+            if (this.inProgress) {
+                this.canceled = true;
+                return false;
+            } else {
+                for (var lock : this.ingredientsToRequest)
+                    network.resolveNetworkLock(lock);
+                return true;
+            }
+        }
+
     }
 
 }
diff --git a/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java b/src/main/java/de/ellpeck/prettypipes/terminal/ItemTerminalBlockEntity.java
@@ -216,19 +216,8 @@ public void cancelCrafting() {
             return;
         for (var craftable : network.getAllCraftables(pipe.getBlockPos())) {
             var otherPipe = network.getPipe(craftable.getLeft());
-            if (otherPipe != null) {
-                otherPipe.activeCrafts.removeIf(c -> {
-                    var data = c.getRight();
-                    if (data.inProgress) {
-                        data.canceled = true;
-                        return false;
-                    } else {
-                        for (var lock : data.ingredientsToRequest)
-                            network.resolveNetworkLock(lock);
-                        return true;
-                    }
-                });
-            }
+            if (otherPipe != null)
+                otherPipe.activeCrafts.removeIf(c -> c.getRight().markCanceledOrResolve(network));
         }
         var lookingPlayers = this.getLookingPlayers();
         if (lookingPlayers.length > 0)