General beamline fixes, balancing (#2899)

* Remove cell chemistry, increase tiering of recipes from mask-making process

* Fix LN2 and LOX in LINAC and Synchrotron

* Fix Synchrotron structure definition antenna having a different meta to the actual block

* Fix Accelerator Glass Hardness

* Fix mobs spawning inside Synchrotron, make LiB6 rods less painful to make

* Halve TC base recipe duration, loosen focus requirements for lower-tier wafers, add more detail to LINAC TT

* Improve LINAC output energy eu/t scaling

* Remove log

* Spotless

* Remove merge artifact

* Spotless apply for branch beamline-fixes-2 for #2899 (#2900)

spotlessApply

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>

1 files changed, 65 insertions, 25 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index c5e68d6a83..e568ea219c 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -351,6 +351,17 @@ public class RecipeLoader {
             .eut(TierEU.RECIPE_IV)
             .addTo(AssemblyLine);
 
+        // Niobium Cavity Casing
+        GT_Values.RA.stdBuilder()
+            .itemInputs(
+                GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Niobium, 1),
+                Materials.Niobium.getPlates(6))
+            .fluidInputs(Materials.Helium.getGas(2000))
+            .itemOutputs(new ItemStack(LanthItemList.NIOBIUM_CAVITY_CASING, 1))
+            .duration(12 * GT_RecipeBuilder.SECONDS)
+            .eut(7680)
+            .addTo(assemblerRecipes);
+
         // Focus Manipulator
         GT_Values.RA.stdBuilder()
             .fluidInputs(
@@ -530,6 +541,24 @@ public class RecipeLoader {
             .eut(TierEU.RECIPE_EV)
             .addTo(multiblockChemicalReactorRecipes);
 
+        /*
+         * GT_Values.RA.stdBuilder()
+         * .fluidInputs(Materials.Nitrogen.getPlasma(4000), Materials.Silane.getFluid(2000))
+         * .fluidOutputs(WerkstoffMaterialPool.NitrogenPlasmaSilaneMix.getFluidOrGas(6000))
+         * .duration(20 * GT_RecipeBuilder.SECONDS)
+         * .eut(7680)
+         * .addTo(mixerNonCellRecipes);
+         */
+
+        GT_Values.RA.stdBuilder()
+            .fluidInputs(Materials.Nitrogen.getPlasma(4000))
+            .itemInputs(Materials.Silane.getCells(2))
+            .fluidOutputs(WerkstoffMaterialPool.NitrogenPlasmaSilaneMix.getFluidOrGas(6000))
+            .duration(20 * GT_RecipeBuilder.SECONDS)
+            .eut(7680)
+            .noOptimize()
+            .addTo(mixerRecipes);
+
         // NB: http://www.smfl.rit.edu/pdf/process/process_nitride_etch_paper.pdf
         // Reactive Ion Etchant
         GT_Values.RA.stdBuilder()
@@ -558,8 +587,8 @@ public class RecipeLoader {
             .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK1)))
             .outputChances(10000)
             .requiresCleanRoom()
-            .duration(12 * SECONDS)
-            .eut(TierEU.RECIPE_EV)
+            .duration(144 * SECONDS)
+            .eut(TierEU.RECIPE_LuV)
             .addTo(autoclaveRecipes);
 
         /*
@@ -577,18 +606,18 @@ public class RecipeLoader {
             .fluidInputs(Materials.Silane.getGas(4000))
             .itemOutputs(new ItemStack(LanthItemList.SUBSTRATE_PRECURSOR))
             .duration(60 * GT_RecipeBuilder.SECONDS)
-            .eut(TierEU.RECIPE_HV)
+            .eut(TierEU.RECIPE_LuV)
             .requiresCleanRoom()
             .addTo(autoclaveRecipes);
 
         // Now to deposit nitride
         GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(LanthItemList.SUBSTRATE_PRECURSOR), Materials.Silane.getCells(2))
-            .fluidInputs(Materials.Nitrogen.getPlasma(4000))
+            .itemInputs(new ItemStack(LanthItemList.SUBSTRATE_PRECURSOR))
+            .fluidInputs(WerkstoffMaterialPool.NitrogenPlasmaSilaneMix.getFluidOrGas(4000))
             .fluidOutputs(Materials.Nitrogen.getGas(3000))
             .itemOutputs(new ItemStack(LanthItemList.MASK_SUBSTRATE), Materials.Empty.getCells(2))
             .duration(30 * GT_RecipeBuilder.SECONDS)
-            .eut(TierEU.RECIPE_EV)
+            .eut(TierEU.RECIPE_LuV)
             .specialValue(3200)
             .requiresCleanRoom()
             .addTo(blastFurnaceRecipes);
@@ -606,8 +635,8 @@ public class RecipeLoader {
             GT_Values.RA.stdBuilder()
                 .itemInputs(GT_Utility.copyAmount(0, lens), new ItemStack(LanthItemList.MASK_SUBSTRATE))
                 .itemOutputs(new ItemStack(LanthItemList.MASKED_MASK))
-                .duration(60 * GT_RecipeBuilder.SECONDS)
-                .eut(TierEU.RECIPE_EV)
+                .duration(30 * GT_RecipeBuilder.SECONDS)
+                .eut(TierEU.RECIPE_IV)
                 .requiresCleanRoom()
                 .addTo(WaferEngravingRecipes);
 
@@ -618,11 +647,11 @@ public class RecipeLoader {
             .fluidInputs(WerkstoffMaterialPool.FluoroformOxygenMix.getFluidOrGas(4000))
             .itemOutputs(new ItemStack(LanthItemList.ETCHED_MASK_1))
             .duration(60 * GT_RecipeBuilder.SECONDS)
-            .eut(TierEU.RECIPE_EV)
+            .eut(TierEU.RECIPE_LuV)
             .requiresCleanRoom()
             .addTo(autoclaveRecipes);
 
-        // Etch pt. 2 with KOH
+        // Etch pt. 2 with LiCl
         GT_Values.RA.stdBuilder()
             .fluidInputs(Materials.Argon.getGas(1000))
             .itemInputs(
@@ -630,8 +659,8 @@ public class RecipeLoader {
                 MyMaterial.lithiumChloride.get(OrePrefixes.dust, 2),
                 GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4))
             .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2)))
-            .duration(25 * GT_RecipeBuilder.SECONDS)
-            .eut(TierEU.RECIPE_EV)
+            .duration(80 * GT_RecipeBuilder.SECONDS)
+            .eut(TierEU.RECIPE_ZPM)
             .specialValue(2400)
             .addTo(blastFurnaceRecipes);
 
@@ -643,8 +672,8 @@ public class RecipeLoader {
                 Materials.Gold.getPlates(2))
             .fluidInputs(Materials.Hydrogen.getGas(1000))
             .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK3)))
-            .duration(10 * GT_RecipeBuilder.SECONDS)
-            .eut(TierEU.RECIPE_EV)
+            .duration(2 * GT_RecipeBuilder.MINUTES)
+            .eut(TierEU.RECIPE_ZPM)
             .specialValue(3600)
             .addTo(blastFurnaceRecipes);
 
@@ -666,9 +695,10 @@ public class RecipeLoader {
                         .fluidInputs(Materials.Sunnarium.getMolten(1440L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.PPIC)))
                         .duration(60 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_ZPM)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
-                        .addTo(UniversalChemical);
+                        .addTo(UniversalChemical); // This is incredibly boring and doesn't make much sense, fix at some
+                                                   // point. Maybe engrave again from precursor?
 
                 } else if (mask == MaskList.HPIC) {
                     GT_Values.RA.stdBuilder()
@@ -678,7 +708,7 @@ public class RecipeLoader {
                         .fluidInputs(Materials.VanadiumGallium.getMolten(288L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.HPIC)))
                         .duration(60 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_IV)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
                         .addTo(UniversalChemical);
 
@@ -691,7 +721,7 @@ public class RecipeLoader {
                         .fluidInputs(Materials.Naquadah.getMolten(576L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.UHPIC)))
                         .duration(60 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_LuV)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
                         .addTo(UniversalChemical);
 
@@ -704,7 +734,7 @@ public class RecipeLoader {
                         .fluidInputs(Materials.Glowstone.getMolten(576L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.NCPU)))
                         .duration(60 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_EV)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
                         .addTo(UniversalChemical);
 
@@ -717,7 +747,7 @@ public class RecipeLoader {
                         .fluidInputs(Materials.Radon.getGas(50L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.QBIT)))
                         .duration(60 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_EV)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
                         .addTo(UniversalChemical);
 
@@ -726,7 +756,7 @@ public class RecipeLoader {
                         .fluidInputs(Materials.GalliumArsenide.getMolten(288L))
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.QBIT)))
                         .duration(45 * GT_RecipeBuilder.SECONDS)
-                        .eut(TierEU.RECIPE_EV)
+                        .eut(mask.getEngraverEUt())
                         .requiresCleanRoom()
                         .addTo(UniversalChemical);
 
@@ -747,7 +777,7 @@ public class RecipeLoader {
                     .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask)))
                     .requiresCleanRoom()
                     .duration(120 * SECONDS)
-                    .eut(TierEU.RECIPE_EV)
+                    .eut(mask.getEngraverEUt())
                     .addTo(WaferEngravingRecipes);
 
             } else if (mask == MaskList.NOR) {
@@ -759,7 +789,7 @@ public class RecipeLoader {
                     .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask)))
                     .requiresCleanRoom()
                     .duration(120 * SECONDS)
-                    .eut(TierEU.RECIPE_EV)
+                    .eut(mask.getEngraverEUt())
                     .addTo(WaferEngravingRecipes);
 
             }
@@ -777,7 +807,7 @@ public class RecipeLoader {
                         .itemOutputs(new ItemStack(LanthItemList.maskMap.get(mask)))
                         .requiresCleanRoom()
                         .duration(120 * SECONDS)
-                        .eut(TierEU.RECIPE_EV)
+                        .eut(mask.getEngraverEUt())
                         .addTo(WaferEngravingRecipes);
 
                 }
@@ -1029,6 +1059,16 @@ public class RecipeLoader {
             .eut(450)
             .addTo(UniversalChemical);
 
+        // La + 6HCl = LaCl3 + 3H
+        GT_Values.RA.stdBuilder()
+            .itemInputs(Materials.Lanthanum.getDust(1), GT_Utility.getIntegratedCircuit(1))
+            .fluidInputs(Materials.HydrochloricAcid.getFluid(3000))
+            .itemOutputs(WerkstoffMaterialPool.LanthaniumChloride.get(OrePrefixes.dust, 4))
+            .fluidOutputs(Materials.Hydrogen.getGas(3000))
+            .duration(10 * SECONDS)
+            .eut(480)
+            .addTo(UniversalChemical);
+
         // Lanthanum Oxide
         GT_Values.RA.stdBuilder()
             .fluidInputs(Materials.Water.getFluid(3000))
@@ -1063,7 +1103,7 @@ public class RecipeLoader {
             .fluidInputs(WerkstoffMaterialPool.BoronTrichloride.getFluidOrGas(8000))
             .fluidOutputs(FluidRegistry.getFluidStack("boricacid", 1000))
             .itemInputs(WerkstoffMaterialPool.LanthanumOxide.get(OrePrefixes.dust, 1))
-            .itemOutputs(WerkstoffMaterialPool.LanthanumHexaboride.get(OrePrefixes.gemChipped))
+            .itemOutputs(WerkstoffMaterialPool.LanthanumHexaboride.get(OrePrefixes.gemFlawless))
             .duration(60 * GT_RecipeBuilder.SECONDS)
             .eut(TierEU.RECIPE_IV)
             .addTo(autoclaveRecipes);