Skip to content

Commit

Permalink
Merge pull request #449 from planetme/air-separation
Browse files Browse the repository at this point in the history 
Air separation (Requires 0.1.6)
  • Loading branch information
@swagXDragonSlayer46YT
swagXDragonSlayer46YT authored Sep 15, 2023
2 parents 4840611 + 6d075cb commit ddddd86
Show file tree
Hide file tree
Showing 8 changed files with 561 additions and 25 deletions.
6 changes: 6 additions & 0 deletions groovy/material/FirstDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3240,5 +3240,11 @@ public class FirstDegreeMaterials{
.components(Sulfur, 2, Chlorine, 2)
.color(0xccc31d)
.build();

DecarburizedAir = new Material.Builder(8572, "decarburized_air")
.fluid(FluidTypes.GAS)
.components(Nitrogen, 78, Oxygen, 21, Argon, 1)
.color(0x90bbe0)
.build();
}
}
15 changes: 14 additions & 1 deletion groovy/material/SecondDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import static gregtech.api.unification.material.info.MaterialIconSet.*;
import static gregtech.api.unification.material.info.MaterialFlags.*;
import static gregtech.api.unification.material.Materials.*;
import static gregtechfoodoption.GTFOMaterialHandler.*;
import static supersymmetry.api.unification.material.info.SuSyMaterialFlags.*;

public class SecondDegreeMaterials {
public static void register() {
Expand Down Expand Up @@ -482,7 +483,7 @@ public class SecondDegreeMaterials {
.fluid()
.components(AmmoniumChloride, 1, SodiumBicarbonate, 1, Water, 1)
.colorAverage()
.build()
.build();

VeryDilutedSodiumSulfateSolution = new Material.Builder(13078, "very_diluted_sodium_sulfate_solution")
.fluid()
Expand Down Expand Up @@ -553,5 +554,17 @@ public class SecondDegreeMaterials {
.components(SiliconDioxide, 6, Alumina, 1, BoronTrioxide, 1, Quicklime, 2)
.color(0x778f8b)
.build();

DeoxygenationCatalystPrecursorSolution = new Material.Builder(13089, "deoxygenation_catalyst_precursor_solution")
.fluid()
.components(AmmoniumHexachloroplatinate, 1, PhosphoricAcid, 1)
.colorAverage()
.build();

DeoxygenationCatalyst = new Material.Builder(13090, "deoxygenation_catalyst")
.dust()
.components(Alumina, 1, Platinum, 1, Chlorine, 4)
.flags(GENERATE_CATALYST_BED)
.build()
}
}
17 changes: 13 additions & 4 deletions groovy/material/SuSyMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,7 @@ class SuSyMaterials {
public static Material Chlorodifluoromethane;
public static Material PolychlorinatedBiphenyl;
public static Material DilutedSilverNitrateSolution;
public static Material DecarburizedAir;
public static Material MolybdenumTrisulfide;
public static Material AmmoniumIsopolytungstateSolution;
public static Material AmmoniumParatungstate;
Expand Down Expand Up @@ -1001,6 +1002,8 @@ class SuSyMaterials {

// Second Degree Materials

public static Material DeoxygenationCatalystPrecursorSolution;
public static Material DeoxygenationCatalyst;
public static Material NitrateSaltMix;
public static Material AmmoniumChlorideSolution;
public static Material PotassiumChlorideSolution;
Expand Down Expand Up @@ -1446,17 +1449,17 @@ class SuSyMaterials {

public static Material EarthlikeAir;
public static Material HotHighPressureSteam;
public static Material CompressedAir;
/*public static Material CompressedAir;
public static Material ChilledAir;
public static Material PurifiedAir;
public static Material BoostedAir;
public static Material ColdWater;
public static Material ColdWater;*/
public static Material WasteGaseousNitrogen;
public static Material PurfiedWasteGaseousNitrogen;
/*public static Material PurfiedWasteGaseousNitrogen;
public static Material ChilledBoostedAir;
public static Material PartiallyLiquifiedAir;
public static Material GaseousAirFeedstock;
public static Material LiquidAirFeedstock;
public static Material LiquidAirFeedstock;*/
public static Material ChillyWasteGaseousNitrogen;
public static Material SubcooledLiquidNitrogen;
public static Material ColdWasteGaseousNitrogen;
Expand All @@ -1481,6 +1484,12 @@ class SuSyMaterials {
public static Material GaseousCrudeNeon;
public static Material LiquidCrudeNeon;
public static Material ColdGaseousNitrogen;
public static Material LiquidArgonProduct;
public static Material LiquidOxygenProduct;
public static Material LiquidNitrogenProduct;
public static Material LiquidDeoxygenatedArgon;
public static Material LiquidWasteNitrogen;
public static Material PartiallyLiquefiedArgon;

public static void init() {
ElementMaterials.register();
Expand Down
48 changes: 44 additions & 4 deletions groovy/material/ThermodynamicsMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ class ThermodynamicsMaterials {

generateHighPressureGases(NaturalGas, 22045, true);

generateHighPressureGases(DecarburizedAir, 22048, true);

generateLiquidFromGas(Hydrogen, 22100, 14);

generateLiquidFromGas(Helium, 22101, 5);
Expand All @@ -262,6 +264,8 @@ class ThermodynamicsMaterials {

generateLiquidFromGas(NaturalGas, 22109, 110);

generateLiquidFromGas(DecarburizedAir, 22110, 80)

generateThermoRefrigerant(Ammonia, 22150);

generateThermoRefrigerant(Propane, 22155);
Expand Down Expand Up @@ -331,7 +335,7 @@ class ThermodynamicsMaterials {
.color(0xffffff)
.build();

CompressedAir = new Material.Builder(22802, "compressed_air")
/*CompressedAir = new Material.Builder(22802, "compressed_air")
.fluid(FluidTypes.GAS)
.color(0x95bee6)
.components(Nitrogen, 78, Oxygen, 21, Argon, 9)
Expand Down Expand Up @@ -363,14 +367,14 @@ class ThermodynamicsMaterials {
.fluidTemp(273)
.color(0x6293e3)
.components(Hydrogen, 2, Oxygen, 1)
.build();
.build();*/

WasteGaseousNitrogen = new Material.Builder(22807, "waste_gaseous_nitrogen")
.fluid(FluidTypes.GAS)
.color(0x29a4a6)
.build();

PurfiedWasteGaseousNitrogen = new Material.Builder(22808, "purified_waste_gaseous_nitrogen")
/*PurfiedWasteGaseousNitrogen = new Material.Builder(22808, "purified_waste_gaseous_nitrogen")
.fluid(FluidTypes.GAS)
.color(0x37b1b3)
.build();
Expand Down Expand Up @@ -401,7 +405,7 @@ class ThermodynamicsMaterials {
.fluidTemp(80)
.color(0x3b72a8)
.components(Nitrogen, 78, Oxygen, 21, Argon, 9)
.build();
.build();*/

ChillyWasteGaseousNitrogen = new Material.Builder(22813, "chilly_waste_gaseous_nitrogen")
.fluid(FluidTypes.GAS)
Expand Down Expand Up @@ -546,6 +550,42 @@ class ThermodynamicsMaterials {
.fluidTemp(140)
.color(0x23b9ba)
.build();

LiquidArgonProduct = new Material.Builder(22837, "liquid_argon_product")
.fluid()
.fluidTemp(87)
.color(0x0ecc0e)
.build();

LiquidOxygenProduct = new Material.Builder(22838, "liquid_oxygen_product")
.fluid()
.fluidTemp(90)
.color(0x459fcc)
.build();

LiquidNitrogenProduct = new Material.Builder(22839, "liquid_nitrogen_product")
.fluid()
.fluidTemp(77)
.color(0x0b9a9c)
.build();

LiquidDeoxygenatedArgon = new Material.Builder(22840, "liquid_deoxygenated_argon")
.fluid()
.fluidTemp(87)
.color(0x3de03d)
.build();

LiquidWasteNitrogen = new Material.Builder(22841, "liquid_waste_nitrogen")
.fluid()
.fluidTemp(77)
.color(0x379394)
.build();

PartiallyLiquefiedArgon = new Material.Builder(22842, "partially_liquefied_argon")
.fluid()
.fluidTemp(120)
.color(0x56bf56)
.build();
}
}

Loading

0 comments on commit ddddd86

Please sign in to comment.