diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-11-25 18:56:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 18:56:39 +0100 |
| commit | d77ee5f704f10ac13415f6ce1ce4388af38725e1 (patch) | |
| tree | afa588c32c3898b7c69a8cadde8a015fae0b3303 /src/main/java/gregtech/common/GT_Proxy.java | |
| parent | a2c7e3160262b03a10a655a5925b51f5def5e218 (diff) | |
| parent | 4cbc1b69a5537b2d6c721a07dc2124071d9ea1e1 (diff) | |
| download | GT5-Unofficial-d77ee5f704f10ac13415f6ce1ce4388af38725e1.tar.gz GT5-Unofficial-d77ee5f704f10ac13415f6ce1ce4388af38725e1.tar.bz2 GT5-Unofficial-d77ee5f704f10ac13415f6ce1ce4388af38725e1.zip | |
Merge pull request #1283 from JohannesGaessler/CrackingFollowup
Cracking followup 2
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Proxy.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 1e87c4a0b5..dd36364c6e 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -1592,12 +1592,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { crackedFluids[i] = addFluid(prefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH), uncrackedFluid.mTextureName, localPrefixes[i] + aMaterial.mDefaultLocalName, null, aMaterial.mRGBa, 2, 775, null, null, 0); int hydrogenAmount = 2 * i + 2; + int crackerEUT = 120 + 60 * i; + int crackerT = 20 + 10 * i; + int chemReactorEUT = 30; + int chemReactorT = (crackerT*crackerEUT) / chemReactorEUT; GT_Values.RA.addCrackingRecipe(i + 1, new FluidStack(uncrackedFluid, 1000), Materials.Hydrogen.getGas(hydrogenAmount * 1000), - new FluidStack(crackedFluids[i], 1000), 40 + 20 * i, 120 + 60 * i); + new FluidStack(crackedFluids[i], 1000), crackerT, crackerEUT); GT_Values.RA.addChemicalRecipe(Materials.Hydrogen.getCells(hydrogenAmount), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000), - new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(hydrogenAmount), 160 + 80 * i, 30); + new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(hydrogenAmount), chemReactorT, chemReactorEUT); GT_Values.RA.addChemicalRecipe(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1), Materials.Hydrogen.getGas(hydrogenAmount * 1000), - new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); + new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), chemReactorT, chemReactorEUT); } aMaterial.setHydroCrackedFluids(crackedFluids); } @@ -1613,14 +1617,18 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { uncrackedFluid = (GT_Fluid) aMaterial.mGas; } for (int i = 0; i < 3; i++) { + int crackerEUT = 240 + 120 * i; + int crackerT = 20 + 10 * i; + int chemReactorEUT = 30; + int chemReactorT = (crackerT*crackerEUT) / chemReactorEUT; crackedFluids[i] = addFluid(prefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH), uncrackedFluid.mTextureName, localPrefixes[i] + aMaterial.mDefaultLocalName, null, aMaterial.mRGBa, 2, 775, null, null, 0); GT_Values.RA.addCrackingRecipe(i + 1, new FluidStack(uncrackedFluid, 1000), GT_ModHandler.getSteam(1000), - new FluidStack(crackedFluids[i], 1000), 40 + 20 * i, 240 + 120 * i); + new FluidStack(crackedFluids[i], 1000), crackerT, crackerEUT); GT_Values.RA.addChemicalRecipe(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000), - new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); + new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), chemReactorT, chemReactorEUT); GT_Values.RA.addChemicalRecipe(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1), GT_ModHandler.getSteam(1000), - new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30); + new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), chemReactorT, chemReactorEUT); } aMaterial.setSteamCrackedFluids(crackedFluids); } |