aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <Draknyte1@hotmail.com>2020-03-29 00:28:22 +0000
committerAlkalus <Draknyte1@hotmail.com>2020-03-29 00:28:22 +0000
commitc37f52542e037f5c3394cd72e24934029f09406e (patch)
tree3b4b2e8cb4ec52a3090e32eea75355db0d77e922 /src
parent8e95eb1c0876f55d9568d704d150a8c38b1c5316 (diff)
downloadGT5-Unofficial-c37f52542e037f5c3394cd72e24934029f09406e.tar.gz
GT5-Unofficial-c37f52542e037f5c3394cd72e24934029f09406e.tar.bz2
GT5-Unofficial-c37f52542e037f5c3394cd72e24934029f09406e.zip
% Buffered Kerosene output from Coal Tar processing.
$ Small fixes to Rocket Fuel recipes. $ Fixed Hydrochloric Acid generating at the wrong time.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java42
3 files changed, 25 insertions, 25 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 981bfed479..566b8f70a0 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -189,20 +189,20 @@ public class CoalTar extends ItemPackage {
GT_Values.RA.addDistilleryRecipe(
CI.getNumberedCircuit(5), //Circuit
FluidUtils.getFluidStack("fluid.coaltar", 1500), //aInput
- FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
+ FluidUtils.getFluidStack("fluid.kerosene", 600), //aOutput
300, //aDuration
64,//aEUt
false //Hidden?
);
GT_Values.RA.addDistillationTowerRecipe(
- FluidUtils.getFluidStack("fluid.coaltar", 1000),
+ FluidUtils.getFluidStack("fluid.coaltar", 1200),
new FluidStack[]{
FluidUtils.getFluidStack("fluid.coaltaroil", 500), //aOutput
FluidUtils.getFluidStack("liquid_naphtha", 100), //aOutput
FluidUtils.getFluidStack("fluid.ethylbenzene", 150), //aOutput
FluidUtils.getFluidStack("fluid.anthracene", 50), //aOutput
- FluidUtils.getFluidStack("fluid.kerosene", 200), //aOutput
+ FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
},
null,
900,
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 80ce0a2abe..4acbcccf52 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -169,7 +169,7 @@ public class GenericChem extends ItemPackage {
}
// Use GT's if it exists, else make our own.
- if (!FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
+ if (FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
HydrochloricAcid = FluidRegistry.getFluid("hydrochloricacid_gt5u");
}
else {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 158df8f3e9..9f8d9f60ec 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -120,7 +120,7 @@ public class RocketFuels extends ItemPackage {
},
new FluidStack[] {
FluidUtils.getFluidStack("hydrogen", 2000),
- FluidUtils.getFluidStack("fluid.hydrazine", 2000),
+ FluidUtils.getFluidStack(Hydrazine, 2000),
},
new ItemStack[] {
@@ -316,7 +316,7 @@ public class RocketFuels extends ItemPackage {
// RP1_Plus_Liquid_Oxygen
CORE.RA.addChemicalPlantRecipe(
new ItemStack[] {
- CI.getNumberedCircuit(23),
+ CI.getNumberedCircuit(1),
},
new FluidStack[] {
FluidUtils.getFluidStack(Liquid_Oxygen, 2000),
@@ -331,55 +331,55 @@ public class RocketFuels extends ItemPackage {
},
20 * 30,
480,
- 3);
+ 3);
- // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide
+ // Dense_Hydrazine_Mix
CORE.RA.addChemicalPlantRecipe(
new ItemStack[] {
- CI.getNumberedCircuit(23),
+ CI.getNumberedCircuit(2),
},
new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
- FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000),
+ FluidUtils.getFluidStack(Hydrazine, 4000),
+ FluidUtils.getFluidStack("methanol", 6000),
},
new ItemStack[] {
},
new FluidStack[] {
- FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 3000),
+ FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000),
},
- 20 * 48,
- 480,
- 3);
+ 20 * 40,
+ 240,
+ 3);
- // Dense_Hydrazine_Mix
+ // Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide
CORE.RA.addChemicalPlantRecipe(
new ItemStack[] {
- CI.getNumberedCircuit(23),
+ CI.getNumberedCircuit(3),
},
new FluidStack[] {
- FluidUtils.getFluidStack(Hydrazine, 4000),
- FluidUtils.getFluidStack("methanol", 6000),
+ FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 2000),
+ FluidUtils.getFluidStack(Nitrogen_Tetroxide, 2000),
},
new ItemStack[] {
},
new FluidStack[] {
- FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000),
+ FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide, 3000),
},
- 20 * 48,
- 240,
+ 20 * 50,
+ 480,
3);
// Monomethylhydrazine_Plus_Nitric_Acid
CORE.RA.addChemicalPlantRecipe(
new ItemStack[] {
- CI.getNumberedCircuit(23),
+ CI.getNumberedCircuit(4),
},
new FluidStack[] {
FluidUtils.getFluidStack(Monomethylhydrazine, 1000),
@@ -389,10 +389,10 @@ public class RocketFuels extends ItemPackage {
},
new FluidStack[] {
- FluidUtils.getFluidStack(Dense_Hydrazine_Mix, 10000),
+ FluidUtils.getFluidStack(Monomethylhydrazine_Plus_Nitric_Acid, 10000),
},
- 20 * 32,
+ 20 * 60,
240,
3);