Ignore null predicates in machines(...) (GregTechCEu#3634)

jurrejelle · web-flow · commit ee0cf6a9c2a3 · 2025-08-04T14:38:14.000Z
diff --git a/src/main/java/com/gregtechceu/gtceu/api/pattern/Predicates.java b/src/main/java/com/gregtechceu/gtceu/api/pattern/Predicates.java
@@ -67,11 +67,13 @@ public static TraceabilityPredicate blocks(IMachineBlock... blocks) {
     }
 
     public static TraceabilityPredicate machines(MachineDefinition... definitions) {
-        IMachineBlock[] machineBlocks = new IMachineBlock[definitions.length];
-        for (int i = 0; i < machineBlocks.length; i++) {
-            machineBlocks[i] = definitions[i].get();
+        ArrayList<IMachineBlock> machineBlocks = new ArrayList<>(definitions.length);
+        for (var definition : definitions) {
+            if (definition != null) {
+                machineBlocks.add(definition.get());
+            }
         }
-        return blocks(machineBlocks);
+        return blocks(machineBlocks.toArray(IMachineBlock[]::new));
     }
 
     public static TraceabilityPredicate blockTag(TagKey<Block> tag) {

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,13 @@ public static TraceabilityPredicate blocks(IMachineBlock... blocks) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public static TraceabilityPredicate machines(MachineDefinition... definitions) {`
`70`		`- IMachineBlock[] machineBlocks = new IMachineBlock[definitions.length];`
`71`		`- for (int i = 0; i < machineBlocks.length; i++) {`
`72`		`- machineBlocks[i] = definitions[i].get();`
	`70`	`+ ArrayList<IMachineBlock> machineBlocks = new ArrayList<>(definitions.length);`
	`71`	`+ for (var definition : definitions) {`
	`72`	`+ if (definition != null) {`
	`73`	`+ machineBlocks.add(definition.get());`
	`74`	`+ }`
`73`	`75`	`}`
`74`		`- return blocks(machineBlocks);`
	`76`	`+ return blocks(machineBlocks.toArray(IMachineBlock[]::new));`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`public static TraceabilityPredicate blockTag(TagKey<Block> tag) {`