Skip to content

Commit 3107e5a

Browse files
committed
Filter out empty ingredients when adding compression overrides (whoops)
Addresses #207
1 parent 5218281 commit 3107e5a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/main/java/gripe/_90/megacells/misc/CompressionService.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,11 @@ private static boolean overrideRecipe(CraftingRecipe recipe, List<Override> over
370370
return false;
371371
}
372372

373-
for (var input : recipe.getIngredients().getFirst().getItems()) {
373+
var ingredients = recipe.getIngredients().stream()
374+
.filter(ingredient -> !ingredient.isEmpty())
375+
.toList();
376+
377+
for (var input : ingredients.getFirst().getItems()) {
374378
var inputVariant = input.getItemHolder().getData(MEGADataMaps.COMPRESSION_OVERRIDE);
375379

376380
if (inputVariant == null) {
@@ -383,9 +387,7 @@ private static boolean overrideRecipe(CraftingRecipe recipe, List<Override> over
383387

384388
var decompressed = isDecompressionRecipe(recipe);
385389
var larger = (decompressed ? input : output).copy();
386-
var smaller = decompressed
387-
? output.copy()
388-
: input.copyWithCount(recipe.getIngredients().size());
390+
var smaller = decompressed ? output.copy() : input.copyWithCount(ingredients.size());
389391

390392
var override = new Override(larger, smaller);
391393
LOGGER.debug("Found bulk compression override: {}", override);

0 commit comments

Comments
 (0)