aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java14
2 files changed, 15 insertions, 13 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 1a97ddd4d0..724d383ccd 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -2440,6 +2440,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
OrePrefixes.cellHydroCracked1, OrePrefixes.cellHydroCracked2, OrePrefixes.cellHydroCracked3
};
final Fluid uncrackedFluid;
+ // Hydrogen is much more expensive than Steam, they should not be used in similar quantities
+ final int hydrogenDivideAmount = 40;
if (aMaterial.mFluid != null) {
uncrackedFluid = aMaterial.mFluid;
} else if (aMaterial.mGas != null) {
@@ -2456,26 +2458,26 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG
GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), ItemList.Cell_Empty.get(1L))
.asFluid();
- int hydrogenAmount = 2 * i + 2;
+ int hydrogenAmount = i + 1;
GT_Values.RA.addCrackingRecipe(
i + 1,
new FluidStack(uncrackedFluid, 1000),
- Materials.Hydrogen.getGas(hydrogenAmount * 800),
+ Materials.Hydrogen.getGas(hydrogenAmount * 800 / hydrogenDivideAmount),
new FluidStack(crackedFluids[i], 1000),
20 + 20 * i,
240);
GT_Values.RA.addChemicalRecipe(
Materials.Hydrogen.getCells(hydrogenAmount),
GT_Utility.getIntegratedCircuit(i + 1),
- new FluidStack(uncrackedFluid, 1000),
- new FluidStack(crackedFluids[i], 800),
+ new FluidStack(uncrackedFluid, 1000 * hydrogenDivideAmount),
+ new FluidStack(crackedFluids[i], 800 * hydrogenDivideAmount),
Materials.Empty.getCells(hydrogenAmount),
- 160 + 80 * i,
+ 160 * hydrogenDivideAmount + 80 * i,
30);
GT_Values.RA.addChemicalRecipe(
aMaterial.getCells(1),
GT_Utility.getIntegratedCircuit(i + 1),
- Materials.Hydrogen.getGas(hydrogenAmount * 1000),
+ Materials.Hydrogen.getGas(hydrogenAmount * 1000 / hydrogenDivideAmount),
new FluidStack(crackedFluids[i], 800),
Materials.Empty.getCells(1),
160 + 80 * i,
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 03a91aab26..18877cd24e 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -18048,7 +18048,7 @@ public class GT_MachineRecipeLoader implements Runnable {
120);
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Ethylene.getSeverelyHydroCracked(1000),
- new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000)},
+ new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(20)},
GT_Values.NI,
120,
120);
@@ -18079,13 +18079,13 @@ public class GT_MachineRecipeLoader implements Runnable {
120);
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Ethane.getModeratelyHydroCracked(1000),
- new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(2000)},
+ new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(20)},
GT_Values.NI,
120,
120);
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Ethane.getSeverelyHydroCracked(1000),
- new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(4000)},
+ new FluidStack[] {Materials.Methane.getGas(2000), Materials.Hydrogen.getGas(40)},
GT_Values.NI,
120,
120);
@@ -18161,7 +18161,7 @@ public class GT_MachineRecipeLoader implements Runnable {
120);
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Propane.getSeverelyHydroCracked(1000),
- new FluidStack[] {Materials.Methane.getGas(3000), Materials.Hydrogen.getGas(2000)},
+ new FluidStack[] {Materials.Methane.getGas(3000), Materials.Hydrogen.getGas(20)},
GT_Values.NI,
120,
120);
@@ -18349,7 +18349,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Gas.getLightlyHydroCracked(1000),
new FluidStack[] {
- Materials.Methane.getGas(1300), Materials.Hydrogen.getGas(1500), Materials.Helium.getGas(100)
+ Materials.Methane.getGas(1300), Materials.Hydrogen.getGas(15), Materials.Helium.getGas(100)
},
GT_Values.NI,
120,
@@ -18357,7 +18357,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Gas.getModeratelyHydroCracked(1000),
new FluidStack[] {
- Materials.Methane.getGas(1400), Materials.Hydrogen.getGas(3000), Materials.Helium.getGas(150)
+ Materials.Methane.getGas(1400), Materials.Hydrogen.getGas(30), Materials.Helium.getGas(150)
},
GT_Values.NI,
120,
@@ -18365,7 +18365,7 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addUniversalDistillationRecipe(
Materials.Gas.getSeverelyHydroCracked(1000),
new FluidStack[] {
- Materials.Methane.getGas(1500), Materials.Hydrogen.getGas(4000), Materials.Helium.getGas(200)
+ Materials.Methane.getGas(1500), Materials.Hydrogen.getGas(40), Materials.Helium.getGas(200)
},
GT_Values.NI,
120,