Skip to content

Commit

Permalink
Oil rebalance (GTNewHorizons#2741)
Browse files Browse the repository at this point in the history 
* delete conflicting recipes (they never existed anyway?)

* oil distillation recipe changes

* nerf naphtha burn value

* adjust recipe times to the input changes

* adjust to 100L oil input

* add circ 9 recipes

* recipe times

* fractions
  • Loading branch information
@Pxx500 @ah-OOG-ah
Pxx500 authored and ah-OOG-ah committed Jul 31, 2024
1 parent 2ffcbc9 commit 6abc8b6
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/enums/Materials.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials SulfuricNaphtha = new Materials( 736, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "SulfuricNaphtha" , "Sulfuric Naphtha" , 1, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
public static Materials SulfuricLightFuel = new Materials( 737, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "SulfuricLightFuel" , "Sulfuric Light Fuel" , 0, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
public static Materials SulfuricHeavyFuel = new Materials( 738, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "SulfuricHeavyFuel" , "Sulfuric Heavy Fuel" , 3, 40, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack );
public static Materials Naphtha = new Materials( 739, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Naphtha" , "Naphtha" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow).setCanBeCracked(true);
public static Materials Naphtha = new Materials( 739, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "Naphtha" , "Naphtha" , 1, 220, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow).setCanBeCracked(true);
public static Materials LightFuel = new Materials( 740, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LightFuel" , "Light Fuel" , 0, 305, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow).setCanBeCracked(true);
public static Materials HeavyFuel = new Materials( 741, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "HeavyFuel" , "Heavy Fuel" , 3, 240, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack).setCanBeCracked(true);
public static Materials LPG = new Materials( 742, TextureSet.SET_FLUID , 1.0F, 0, 0, 16 , 255, 255, 0, 0, "LPG" , "LPG" , 1, 320, -1, 0, false, false, 1, 1, 1, Dyes.dyeYellow );
Expand Down
78 changes: 27 additions & 51 deletions src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,30 +129,6 @@ public void run() {
.eut(16)
.addTo(distilleryRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(4))
.fluidInputs(Materials.OilLight.getFluid(300L))
.fluidOutputs(Materials.Oil.getFluid(100L))
.duration(16 * TICKS)
.eut(24)
.addTo(distilleryRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(4))
.fluidInputs(Materials.OilMedium.getFluid(200L))
.fluidOutputs(Materials.Oil.getFluid(100L))
.duration(16 * TICKS)
.eut(24)
.addTo(distilleryRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(4))
.fluidInputs(Materials.OilHeavy.getFluid(100L))
.fluidOutputs(Materials.Oil.getFluid(100L))
.duration(16 * TICKS)
.eut(24)
.addTo(distilleryRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(1))
.itemOutputs(MaterialsOreAlum.SluiceSand.getDust(1))
Expand Down Expand Up @@ -530,14 +506,14 @@ public void distillationTowerRecipes() {

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(9))
.fluidInputs(Materials.OilLight.getFluid(1500))
.fluidInputs(Materials.OilLight.getFluid(1000))
.fluidOutputs(
Materials.SulfuricHeavyFuel.getFluid(100),
Materials.SulfuricLightFuel.getFluid(200),
Materials.SulfuricNaphtha.getFluid(300),
MaterialsKevlar.NaphthenicAcid.getFluid(25),
Materials.SulfuricGas.getGas(2400))
.duration(1 * SECONDS + 12 * TICKS)
Materials.SulfuricHeavyFuel.getFluid(70),
Materials.SulfuricLightFuel.getFluid(130),
Materials.SulfuricNaphtha.getFluid(200),
MaterialsKevlar.NaphthenicAcid.getFluid(15),
Materials.SulfuricGas.getGas(1600))
.duration(1 * SECONDS + 1 * TICKS)
.eut(TierEU.RECIPE_HV)
.addTo(distillationTowerRecipes);

Expand All @@ -556,24 +532,24 @@ public void distillationTowerRecipes() {

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(9))
.fluidInputs(Materials.Oil.getFluid(500L))
.fluidInputs(Materials.Oil.getFluid(1000L))
.fluidOutputs(
Materials.SulfuricHeavyFuel.getFluid(150),
Materials.SulfuricLightFuel.getFluid(500),
Materials.SulfuricNaphtha.getFluid(200),
MaterialsKevlar.NaphthenicAcid.getFluid(25),
Materials.SulfuricGas.getGas(600))
.duration(1 * SECONDS + 12 * TICKS)
Materials.SulfuricHeavyFuel.getFluid(300),
Materials.SulfuricLightFuel.getFluid(1000),
Materials.SulfuricNaphtha.getFluid(400),
MaterialsKevlar.NaphthenicAcid.getFluid(50),
Materials.SulfuricGas.getGas(1200))
.duration(3 * SECONDS + 4 * TICKS)
.eut(TierEU.RECIPE_HV)
.addTo(distillationTowerRecipes);

GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(9))
.fluidInputs(Materials.OilHeavy.getFluid(1000))
.fluidOutputs(
Materials.SulfuricHeavyFuel.getFluid(2500),
Materials.SulfuricLightFuel.getFluid(450),
Materials.SulfuricNaphtha.getFluid(150),
Materials.SulfuricHeavyFuel.getFluid(450),
Materials.SulfuricLightFuel.getFluid(150),
Materials.SulfuricNaphtha.getFluid(300),
MaterialsKevlar.NaphthenicAcid.getFluid(50),
Materials.SulfuricGas.getGas(600))
.duration(5 * SECONDS)
Expand Down Expand Up @@ -669,12 +645,12 @@ public void universalDistillationTowerRecipes() {
256);

addUniversalDistillationRecipewithCircuit(
Materials.OilLight.getFluid(150),
Materials.OilLight.getFluid(100),
new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(10), Materials.SulfuricLightFuel.getFluid(20),
Materials.SulfuricNaphtha.getFluid(30), Materials.SulfuricGas.getGas(240) },
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(7), Materials.SulfuricLightFuel.getFluid(13),
Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(160) },
null,
20,
10,
96);
addUniversalDistillationRecipewithCircuit(
Materials.OilMedium.getFluid(100),
Expand All @@ -685,20 +661,20 @@ public void universalDistillationTowerRecipes() {
20,
96);
addUniversalDistillationRecipewithCircuit(
Materials.Oil.getFluid(50L),
Materials.Oil.getFluid(100L),
new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50),
Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60) },
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(30), Materials.SulfuricLightFuel.getFluid(100),
Materials.SulfuricNaphtha.getFluid(40), Materials.SulfuricGas.getGas(120) },
null,
20,
30,
96);
addUniversalDistillationRecipewithCircuit(
Materials.OilHeavy.getFluid(100),
new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(250), Materials.SulfuricLightFuel.getFluid(45),
new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(100), Materials.SulfuricLightFuel.getFluid(45),
Materials.SulfuricNaphtha.getFluid(15), Materials.SulfuricGas.getGas(60) },
null,
20,
40,
288);

// 2 0.5HCl(Diluted) = HCl + H2O
Expand Down

0 comments on commit 6abc8b6

Please sign in to comment.