From 352702417fb4036c4048f4095ef225db44b82d26 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 Dec 2021 11:53:50 +0000 Subject: Changed composition of Rare Earth I. Buffed Rare Earth processing lines. Buffed Industrial HF production and conversion recipes. --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 48 ++++++++++++++------- .../core/recipe/RECIPES_RareEarthProcessing.java | 49 ++++++++++++++-------- 2 files changed, 63 insertions(+), 34 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 5156b938db..39ebb99be9 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1662,19 +1662,35 @@ public class RECIPES_GREGTECH { * so if you dissolve aparite in sulphuric acid you'll get a mixture of * SO2, H2O, HF and HCl */ - final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800), - FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null, - 45 * 20, 256); + final FluidStack[] apatiteOutput = { + FluidUtils.getFluidStack("sulfurousacid", 3800), + FluidUtils.getFluidStack("hydrogenchloride", 1000), + FluidUtils.getFluidStack("hydrofluoricacid", 400) }; + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfuricapatite", 5200), + apatiteOutput, null, + 45 * 20, + 120); - final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500), + final FluidStack[] sulfurousacidOutput = { + FluidUtils.getFluidStack("sulfurdioxide", 500), FluidUtils.getFluidStack("water", 500) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput, - null, 10 * 20, 60); + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfurousacid", 1000), + sulfurousacidOutput, + null, + 10 * 20, + 60); - final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 144 * 2) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), sulfurdioxideOutput, - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), 5 * 20, 30); + final FluidStack[] sulfurdioxideOutput = { + FluidUtils.getFluidStack("oxygen", 2000) + }; + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), + sulfurdioxideOutput, + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), + 5 * 20, + 30); } private static void addFuels() { @@ -1787,8 +1803,8 @@ public class RECIPES_GREGTECH { 10 * 20); GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), - null, + CI.getNumberedAdvancedCircuit(21), + ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), FluidUtils.getFluidStack("sulfuricacid", 144 * 32), FluidUtils.getFluidStack("sulfuricapatite", 144 * 8), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), @@ -1798,12 +1814,12 @@ public class RECIPES_GREGTECH { if (temp_GT5u_SA != null) { //Refine GT HF into GT++ HF GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), + CI.getNumberedAdvancedCircuit(21), temp_GT5u_SA, - null, // Fluid Input + FluidUtils.getHydrofluoricAcid(2000), // Fluid Input FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output - CI.emptyCells(7), - 2 * 20); + CI.emptyCells(5), + 30 * 20); } } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java index 97636e9e65..864d0bcca8 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java @@ -168,34 +168,47 @@ public class RECIPES_RareEarthProcessing { GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 3), FluidUtils.getFluidStack(aSulfuric, 1000), - RARE_EARTH_LOW.getCrushed(1), - RARE_EARTH_LOW.getCrushed(1), - RARE_EARTH_LOW.getCrushed(1), - new int[] {10000, 10000, 9000}, + RARE_EARTH_LOW.getCrushed(2), + RARE_EARTH_LOW.getCrushed(2), + RARE_EARTH_LOW.getCrushed(2), + new int[] {10000, 10000, 10000}, 20 * 30, - (int) GT_Values.V[1]); + MaterialUtils.getVoltageForTier(1)); // HV Rare Earth GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 6), - FluidUtils.getFluidStack(aHydrocholric, 3000), - RARE_EARTH_MID.getCrushed(2), - RARE_EARTH_MID.getCrushed(2), - RARE_EARTH_MID.getCrushed(2), + FluidUtils.getFluidStack(aHydrocholric, 2000), + RARE_EARTH_MID.getCrushed(4), + RARE_EARTH_MID.getCrushed(4), + RARE_EARTH_MID.getCrushed(4), new int[] {10000, 9000, 8000}, - 20 * 60, - (int) GT_Values.V[3]); + 20 * 30, + MaterialUtils.getVoltageForTier(3)); // IV Rare Earth GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 9), - FluidUtils.getFluidStack(aNitric, 6000), - RARE_EARTH_HIGH.getCrushed(3), - RARE_EARTH_HIGH.getCrushed(3), - RARE_EARTH_HIGH.getCrushed(3), - new int[] {9000, 8000, 7000}, - 20 * 90, - (int) GT_Values.V[5]); + FluidUtils.getHydrofluoricAcid(3000), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + new int[] {10000, 9000, 8000}, + 20 * 30, + MaterialUtils.getVoltageForTier(5)); + + if (FluidUtils.doesHydrofluoricAcidGtExist()) { + // IV Rare Earth + GT_Values.RA.addChemicalBathRecipe( + ItemUtils.getSimpleStack(aRareEarth, 9), + FluidUtils.getHydrofluoricAcidGT(6000), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + new int[] {9000, 8000, 7000}, + 20 * 30, + MaterialUtils.getVoltageForTier(5)); + } } -- cgit From aed9ee9f560200a7139e1f3f80ff087cf80c0be6 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:04:35 +0000 Subject: More recipe adjustments. Changed how Fluorite is handled. Change Monazite Froth output to no longer contain Praseodymium. Change Monazite Froth output to have 4x less Europium. --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 39ebb99be9..c8b65bfd37 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -390,6 +390,28 @@ public class RECIPES_GREGTECH { 20 * 20, MaterialUtils.getVoltageForTier(aBotmiumTier-2), 6); + + + //Refine GT HF into GT++ HF + if (FluidUtils.doesHydrofluoricAcidGtExist()) { + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(22), + }, + new FluidStack[] { + FluidUtils.getHydrofluoricAcid(2000), + FluidUtils.getHydrofluoricAcidGT(5000) + }, + new ItemStack[] { + + }, + new FluidStack[] { + FluidUtils.getHydrofluoricAcid(6000) + }, + 30 * 20, + 480, + 3); + } } @@ -1751,16 +1773,6 @@ public class RECIPES_GREGTECH { } private static void chemicalBathRecipes() { - - GT_Values.RA.addChemicalBathRecipe( - FLUORIDES.FLUORITE.getCrushed(2), - FluidUtils.getFluidStack("hydrogen", 2000), - FLUORIDES.FLUORITE.getCrushedPurified(8), - FLUORIDES.FLUORITE.getDustImpure(4), - FLUORIDES.FLUORITE.getDustPurified(2), - new int[] { 10000, 5000, 1000 }, - 30 * 20, - 240); } @@ -1804,24 +1816,12 @@ public class RECIPES_GREGTECH { GT_Values.RA.addChemicalRecipe( CI.getNumberedAdvancedCircuit(21), - ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), - FluidUtils.getFluidStack("sulfuricacid", 144 * 32), - FluidUtils.getFluidStack("sulfuricapatite", 144 * 8), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 32), + FluidUtils.getFluidStack("sulfuricacid", 4000), + FluidUtils.getFluidStack("sulfuricapatite", 8000), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 8), 20 * 20); - ItemStack temp_GT5u_SA = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 5); - if (temp_GT5u_SA != null) { - //Refine GT HF into GT++ HF - GT_Values.RA.addChemicalRecipe( - CI.getNumberedAdvancedCircuit(21), - temp_GT5u_SA, - FluidUtils.getHydrofluoricAcid(2000), // Fluid Input - FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output - CI.emptyCells(5), - 30 * 20); - } - } private static void blastFurnaceRecipes() { -- cgit From c12349650d68a89e39775722620ffa2b702ed704 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:40:09 +0000 Subject: Fix Fluorite Dehydrator recipe. Add Tooltip to 8k/32k Volumetric Flasks to show max capacity. --- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 24 ---------------------- 1 file changed, 24 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index c8b65bfd37..3d0e6aebfd 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1290,30 +1290,6 @@ public class RECIPES_GREGTECH { 2 * 20, 500); // EU - // CaF2 + H2SO4 → CaSO4(solid) + 2 HF - FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000); - if (aGregtechHydro == null) { - aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000); - } - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.getNumberedAdvancedCircuit(5), - ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), - }, - FluidUtils.getFluidStack("sulfuricacid", 56 * 144), - aGregtechHydro, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) - }, - new int[] { 10000, 100, 100, 300, 200 }, - 10 * 60 * 20, - 230); // EU - CORE.RA.addDehydratorRecipe( new ItemStack[] { -- cgit