Beamline fixes 4 (#3504)

Co-authored-by: BlueHero233 <jeleiacraft@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Ethryan <3237986+Ethryan@users.noreply.github.com>

1 files changed, 63 insertions, 47 deletions

diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java
index d71b9a571e..f0b170bb4a 100644
--- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java
+++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java
@@ -11,6 +11,7 @@ import net.minecraftforge.fluids.FluidRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.material.MaterialsElements;
@@ -50,7 +51,7 @@ public class BeamlineRecipeLoader {
             Materials.SuperCoolant.getFluid(1L)
                 .getFluid()
                 .getName(),
-            Materials.Water.getFluid(1L)
+            WerkstoffMaterialPool.HotSuperCoolant.getFluidOrGas(1000)
                 .getFluid());
 
         /*
@@ -111,59 +112,74 @@ public class BeamlineRecipeLoader {
             if (mask.getProducedItem() == null) // Blank or error
                 continue;
 
-            int index = 0;
-            for (ItemList wafer : VIABLE_WAFERS) {
-
-                index++;
-
-                if (!Arrays.asList(mask.getForbiddenWafers())
-                    .contains(wafer)) {
-
-                    BeamlineRecipeAdder2.instance.addTargetChamberRecipe(
-                        wafer.get(1),
-                        GTUtility.copyAmountUnsafe((int) Math.pow(2, index + 2), mask.getProducedItem()),
-                        new ItemStack(LanthItemList.maskMap.get(mask), 0),
-                        1,
-                        mask.getBaselineAmount() * (int) Math.pow(Math.sqrt(3), index - 1), // 3x recipe amount increase
-                                                                                            // per 2 increases in wafer
-                                                                                            // tier. This greatly
-                                                                                            // incentivises the use of
-                                                                                            // higher tier boule wafer
-                                                                                            // recipes
-                        mask.getMinEnergy(),
-                        mask.getMaxEnergy(),
-                        mask.getMinFocus(),
-                        1,
-                        1920);
+            if (mask.getTCTargetItem() == null) { // Wafer TC recipe
+
+                int index = 0;
+                for (ItemList wafer : VIABLE_WAFERS) {
+
+                    index++;
+
+                    if (!Arrays.asList(mask.getForbiddenWafers())
+                        .contains(wafer)) {
+
+                        BeamlineRecipeAdder2.instance.addTargetChamberRecipe(
+                            wafer.get(1),
+                            GTUtility.copyAmountUnsafe((int) Math.pow(2, index + 2), mask.getProducedItem()),
+                            new ItemStack(LanthItemList.maskMap.get(mask), 0),
+                            1,
+                            (int) Math.round(mask.getBaselineAmount() * Math.pow(Math.sqrt(2), index - 1)), // 2x recipe
+                                                                                                            // amount
+                                                                                                            // increase
+                            // per 2 increases in wafer
+                            // tier. This greatly
+                            // incentivises the use of
+                            // higher tier boule wafer
+                            // recipes
+                            mask.getMinEnergy(),
+                            mask.getMaxEnergy(),
+                            mask.getMinFocus(),
+                            1,
+                            1920);
+
+                    }
 
                 }
 
+                continue;
+
             }
 
-            /*
-             * if (!Arrays.asList(MaskList.CPU.getForbiddenWafers()).contains(wafer)) {
-             * BeamlineRecipeAdder.instance.addTargetChamberRecipe( wafer.get(1), GT_Utility.copyAmountUnsafe((int)
-             * Math.pow(2, index + 2), ItemList.Circuit_Wafer_CPU.get(1)), //Varies new
-             * ItemStack(LanthItemList.maskMap.get(MaskList.CPU), 0), // Varies 0, 10 * (int) Math.pow(2, index - 1), //
-             * Varies 1, //Varies 10000000, //Varies 50, //Varies 1, 1920 ); } /* PPIC
-             */
-
-            /*
-             * if (!Arrays.asList(MaskList.PPIC.getForbiddenWafers()).contains(wafer)) {
-             * GTLog.out.print("Adding recipe for PPIC with " + wafer.get(1).getUnlocalizedName() + " amount: " + 40 *
-             * (int) Math.pow(2, index - 1)); BeamlineRecipeAdder.instance.addTargetChamberRecipe( wafer.get(1),
-             * ItemList.Circuit_Wafer_PPIC.get((int) Math.pow(2, index + 2)), //Varies new
-             * ItemStack(LanthItemList.maskMap.get(MaskList.PPIC), 0), // Varies 0, 40 * (int) Math.pow(2, index - 1),
-             * // Varies 1, //Varies 10000000, //Varies 50, //Varies 1, 1920 ); }
-             */
+            // Non-wafer recipes
+
+            BeamlineRecipeAdder2.instance.addTargetChamberRecipe(
+                GTUtility.copyAmountUnsafe(1, mask.getTCTargetItem()),
+                GTUtility.copyAmountUnsafe(4, mask.getProducedItem()),
+                new ItemStack(LanthItemList.maskMap.get(mask), 0),
+                1,
+                mask.getBaselineAmount(),
+                mask.getMinEnergy(),
+                mask.getMaxEnergy(),
+                mask.getMinFocus(),
+                1,
+                (int) TierEU.RECIPE_LuV);
 
         }
-        /*
-         * BeamlineRecipeAdder2.instance.addTargetChamberRecipe( new ItemStack(Items.coal, 1), new
-         * ItemStack(Items.diamond, 1), null, 1, 20, 100, 1000, 60, 1, 1920);
-         * BeamlineRecipeAdder2.instance.addTargetChamberRecipe( new ItemStack(Items.coal, 1), new
-         * ItemStack(Items.cooked_chicken, 1), null, 1, 20, 1, 10, 60, 1, 1920);
-         */
+
+        /* LuAG */
+
+        // Raw Advanced Crystal Chip
+
+        BeamlineRecipeAdder2.instance.addTargetChamberRecipe(
+            WerkstoffMaterialPool.CeriumDopedLutetiumAluminiumGarnet.get(OrePrefixes.gemExquisite, 1),
+            GTUtility.copyAmountUnsafe(64, ItemList.Circuit_Chip_CrystalSoC.get(1)),
+            new ItemStack(LanthItemList.maskMap.get(MaskList.CSOC), 0),
+            1,
+            24,
+            5,
+            12,
+            60,
+            1,
+            (int) TierEU.RECIPE_LuV);
 
         BeamlineRecipeAdder2.instance.addTargetChamberRecipe(
             new ItemStack(Items.chicken, 1),