aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPxx500 <81298696+Pxx500@users.noreply.github.com>2024-08-05 01:20:53 +0200
committerGitHub <noreply@github.com>2024-08-05 01:20:53 +0200
commit83189734085b2f20edf1972a9cdbdd8e76379c70 (patch)
tree06aa658218d90e92c966300c479c176777e6f6c9
parent88912be409e3ee6eb460726af03dc3e69dbdc1e7 (diff)
downloadGT5-Unofficial-83189734085b2f20edf1972a9cdbdd8e76379c70.tar.gz
GT5-Unofficial-83189734085b2f20edf1972a9cdbdd8e76379c70.tar.bz2
GT5-Unofficial-83189734085b2f20edf1972a9cdbdd8e76379c70.zip
CO2 and CO loop price fix (#2824)
* CO2 and CO loop price fix * overshot some values
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java21
2 files changed, 21 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 6bdf6cb776..b7b9c63ebd 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -656,7 +656,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials CalciumAcetateSolution = new MaterialBuilder(671, TextureSet.SET_RUBY , "Calcium Acetate Solution").addCell().addFluid().setRGB(220, 200, 180).setColor(Dyes.dyeCyan).setMaterialList(new MaterialStack(Calcium, 1), new MaterialStack(Carbon, 4), new MaterialStack(Oxygen, 4), new MaterialStack(Hydrogen, 6)).addElectrolyzerRecipe().constructMaterial();
public static Materials Acetone = new MaterialBuilder(672, TextureSet.SET_FLUID , "Acetone").addCell().addFluid().setRGB(175, 175, 175).setColor(Dyes.dyeWhite).setMaterialList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial();
public static Materials Methanol = new MaterialBuilder(673, TextureSet.SET_FLUID , "Methanol").addCell().addFluid().setRGB(170, 136, 0).setColor(Dyes.dyeBrown).setFuelPower(84).setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial();
- public static Materials CarbonMonoxide = new MaterialBuilder(674, TextureSet.SET_FLUID , "Carbon Monoxide").addCell().addGas().setRGB(14, 72, 128).setColor(Dyes.dyeBrown).setFuelType(MaterialBuilder.GAS).setFuelPower(24).setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial();
+ public static Materials CarbonMonoxide = new MaterialBuilder(674, TextureSet.SET_FLUID , "Carbon Monoxide").addCell().addGas().setRGB(14, 72, 128).setColor(Dyes.dyeBrown).setFuelType(MaterialBuilder.GAS).setFuelPower(24).setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(Oxygen, 1)).constructMaterial();
public static Materials MetalMixture = new MaterialBuilder(676, TextureSet.SET_METALLIC , "Metal Mixture").addDustItems().setRGB(80, 45, 22).setColor(Dyes.dyeBrown).constructMaterial();
public static Materials Ethylene = new MaterialBuilder(677, TextureSet.SET_FLUID , "Ethylene").addCell().addGas().setRGB(225, 225, 225).setColor(Dyes.dyeWhite).setFuelType(MaterialBuilder.GAS).setFuelPower(128).setMaterialList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4)).addElectrolyzerRecipe().setCanBeCracked(true).constructMaterial();
public static Materials Propene = new MaterialBuilder(678, TextureSet.SET_FLUID , "Propene").addCell().addGas().setRGB(255, 221, 85).setColor(Dyes.dyeYellow).setFuelType(MaterialBuilder.GAS).setFuelPower(192).setMaterialList(new MaterialStack(Carbon, 3), new MaterialStack(Hydrogen, 6)).addElectrolyzerRecipe().setCanBeCracked(true).constructMaterial();
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
index 6dbab9cc35..e5d806a87d 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java
@@ -144,13 +144,14 @@ public class ElectrolyzerRecipes implements Runnable {
.duration(50 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(electrolyzerRecipes);
+ // CO2 = C + 2O
GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(1))
.itemOutputs(Materials.Carbon.getDust(1))
.fluidInputs(Materials.CarbonDioxide.getGas(1000))
.fluidOutputs(Materials.Oxygen.getGas(2000))
- .duration(15 * SECONDS)
+ .duration(45 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(electrolyzerRecipes);
@@ -158,6 +159,24 @@ public class ElectrolyzerRecipes implements Runnable {
.itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2))
.itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(2))
.fluidInputs(Materials.CarbonDioxide.getGas(1000))
+ .duration(45 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .addTo(electrolyzerRecipes);
+ // CO = C + O
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(1))
+ .itemOutputs(Materials.Carbon.getDust(1))
+ .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
+ .fluidOutputs(Materials.Oxygen.getGas(1000))
+ .duration(15 * SECONDS)
+ .eut(TierEU.RECIPE_MV)
+ .addTo(electrolyzerRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(1))
+ .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(1))
+ .fluidInputs(Materials.CarbonMonoxide.getGas(1000))
.duration(15 * SECONDS)
.eut(TierEU.RECIPE_MV)
.addTo(electrolyzerRecipes);