diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 48 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java | 49 |
2 files changed, 63 insertions, 34 deletions
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)); + } } |