From 2a4629f32195d8a9a36927f67f8aad5c31a376cb Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Wed, 7 Aug 2024 21:11:15 +0200 Subject: Use distilled wafer for engraving naq wafers instead of no water + circuit (#2843) swap circuits in engraving for distilled water --- .../java/gregtech/api/util/GT_RecipeConstants.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/GT_RecipeConstants.java b/src/main/java/gregtech/api/util/GT_RecipeConstants.java index 592881f039..8cdc9b2b9e 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeConstants.java +++ b/src/main/java/gregtech/api/util/GT_RecipeConstants.java @@ -289,24 +289,22 @@ public class GT_RecipeConstants { switch (wafer) { case Naquadah -> { ArrayList items = new ArrayList<>(Arrays.asList(builder.getItemInputsBasic())); - items.add(GT_Utility.getIntegratedCircuit(1)); - ItemStack[] inputItemsWithC1 = items.toArray(new ItemStack[] {}); - - ArrayList items2 = new ArrayList<>(Arrays.asList(builder.getItemInputsBasic())); - items2.add(GT_Utility.getIntegratedCircuit(2)); - ItemStack[] itemsWithC2 = items2.toArray(new ItemStack[] {}); - // Naquadah wafers can use grade 1-2 purified water for a bonus + ItemStack[] itemInputs = items.toArray(new ItemStack[] {}); + // Naquadah wafers can use grade 1-2 purified water for a bonus, otherwise use distilled so we don't + // have to + // deal with circuits return GT_Utility.concat( builder.copy() - .itemInputs(inputItemsWithC1) + .itemInputs(itemInputs) + .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .addTo(RecipeMaps.laserEngraverRecipes), builder.copy() - .itemInputs(itemsWithC2) + .itemInputs(itemInputs) .fluidInputs(Materials.Grade1PurifiedWater.getFluid(100L)) .duration(halfBoostedRecipeTime) .addTo(RecipeMaps.laserEngraverRecipes), builder.copy() - .itemInputs(itemsWithC2) + .itemInputs(itemInputs) .fluidInputs(Materials.Grade2PurifiedWater.getFluid(100L)) .duration(boostedRecipeTime) .addTo(RecipeMaps.laserEngraverRecipes)); -- cgit