Skip to content

Commit

Permalink
Merge pull request #1018 from WideMann/stuffadditions
Browse files Browse the repository at this point in the history
Graphene chain
  • Loading branch information
bruberu authored Oct 19, 2024
2 parents 980999f + 49b8b7c commit 870e2ef
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 1 deletion.
39 changes: 39 additions & 0 deletions groovy/material/FirstDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3392,5 +3392,44 @@ public class FirstDegreeMaterials {
.build();

Kovar.setFormula("Fe10Ni5Co3", true)

ImpureLithiumCarbonate = new Material.Builder(8621, SuSyUtility.susyId("impure_lithium_carbonate"))
.dust().liquid(new FluidBuilder().temperature(1000))
.components(Carbon * 2, Lithium * 2, Oxygen * 3)
.color(0x4f5c6c)
.build()
.setFormula("(C)(Li2CO3)", true);

WashedGraphene = new Material.Builder(8622, SuSyUtility.susyId("washed_graphene"))
.dust()
.components(Carbon)
.color(0x595999)
.build();

DistilledGraphene = new Material.Builder(8623, SuSyUtility.susyId("distilled_graphene"))
.dust()
.components(Carbon)
.color(0x595959)
.build();

DriedGraphene = new Material.Builder(8624, SuSyUtility.susyId("dried_graphene"))
.dust()
.components(Carbon)
.color(0x797979)
.build();

MoistArgon = new Material.Builder(8625, SuSyUtility.susyId("moist_argon"))
.gas()
.components(Argon, Water)
.colorAverage()
.build()
.setFormula("(Ar)(H20)")

ArgonHydrogenMixture = new Material.Builder(8628, SuSyUtility.susyId("argon_hydrogen_mixture"))
.gas()
.components(Argon, Hydrogen * 4)
.color(0x20a291)
.build()
.setFormula("(Ar)(H)")
}
}
28 changes: 28 additions & 0 deletions groovy/material/SecondDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -699,5 +699,33 @@ public class SecondDegreeMaterials {
.components(Iron * 8, Zinc * 1)
.colorAverage()
.build();

ImpureLithiumCarbonateSolution = new Material.Builder(13115, SuSyUtility.susyId("impure_lithium_carbonate_solution"))
.liquid()
.components(Carbon * 2, Lithium * 2, Oxygen * 3, Water)
.colorAverage()
.build()
.setFormula("(C)(Li2CO3)(H2O)", true);

LithiumCarbonateSolution = new Material.Builder(13116, SuSyUtility.susyId("lithium_carbonate_solution"))
.liquid()
.components(Lithium * 2, Carbon * 1, Oxygen * 3, Water)
.colorAverage()
.build()
.setFormula("(Li2CO3)(H2O)", true);

AcidicArgonHydrogenMixture = new Material.Builder(8626, SuSyUtility.susyId("acidic_argon_hydrogen_mixture"))
.gas(new FluidBuilder().attribute(FluidAttributes.ACID))
.components(Argon, Hydrogen * 4, HydrogenChloride)
.colorAverage()
.build()
.setFormula("(Ar)(HCl)(H)");

AmmoniacalArgonHydrogenMixture = new Material.Builder(8627, SuSyUtility.susyId("ammoniacal_argon_hydrogen_mixture"))
.gas()
.components(Argon, Hydrogen * 4, Ammonia)
.colorAverage()
.build()
.setFormula("(Ar)(NH3)(H)")
}
}
14 changes: 13 additions & 1 deletion groovy/material/SuSyMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,12 @@ class SuSyMaterials {
public static Material LeadFreeSolder;
public static Material CryogenicSolder;
public static Material Kovar;
public static Material ImpureLithiumCarbonate;
public static Material WashedGraphene;
public static Material DistilledGraphene;
public static Material DriedGraphene;
public static Material MoistArgon;
public static Material ArgonHydrogenMixture;

// HP Materials

Expand Down Expand Up @@ -1258,6 +1264,10 @@ class SuSyMaterials {
public static Material SodiumAlumSolution;
public static Material OxidizedManganateSolution;
public static Material GalvanizedSteel;
public static Material ImpureLithiumCarbonateSolution;
public static Material LithiumCarbonateSolution;
public static Material AcidicArgonHydrogenMixture;
public static Material AmmoniacalArgonHydrogenMixture;

// Organic Chemistry Materials

Expand Down Expand Up @@ -1761,7 +1771,6 @@ class SuSyMaterials {
public static Material OxalicAcidSolution;
public static Material GalliumSulfateSolution;
public static Material FormicAcidWaterAzeotrope;

// Thermodynamics Materials

public static Material EarthlikeAir;
Expand Down Expand Up @@ -1798,6 +1807,9 @@ class SuSyMaterials {
public static Material LiquidWasteNitrogen;
public static Material PartiallyLiquefiedArgon;
public static Material SupercriticalCarbonDioxide;
public static Material ColdAmmoniacalArgonHydrogenMixture;
public static Material ColdArgonHydrogenMixture;
public static Material PartiallyLiquefiedArgonHydrogenMixture;

public static void changeFormulas() {
log.infoMC("Changing Formulas!");
Expand Down
21 changes: 21 additions & 0 deletions groovy/material/ThermodynamicsMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -481,5 +481,26 @@ class ThermodynamicsMaterials {
.components(CarbonDioxide)
.colorAverage()
.build();

ColdAmmoniacalArgonHydrogenMixture = new Material.Builder(22844, SuSyUtility.susyId('cold_ammoniacal_argon_hydrogen_mixture'))
.gas(new FluidBuilder().temperature(220))
.components(Argon, Hydrogen, Ammonia)
.colorAverage()
.build()
.setFormula("(Ar)(NH3)(H)")

ColdArgonHydrogenMixture = new Material.Builder(22845, SuSyUtility.susyId('cold_argon_hydrogen_mixture'))
.gas(new FluidBuilder().temperature(220))
.components(Argon, Hydrogen)
.color(0x20a591)
.build()
.setFormula("(Ar)(H)")

PartiallyLiquefiedArgonHydrogenMixture = new Material.Builder(22846, SuSyUtility.susyId('partially_liquefied_argon_hydrogen_mixture'))
.liquid(new FluidBuilder().temperature(73))
.components(Argon, Hydrogen)
.color(0x20aa91)
.build()
.setFormula("(Ar)(H)")
}
}
144 changes: 144 additions & 0 deletions groovy/postInit/chemistry/organic_chemistry/GrapheneChain.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
import globals.Globals

import static gregtech.api.unification.material.Materials.*;
import gregtech.api.unification.material.MarkerMaterials;
import static gregtech.api.unification.ore.OrePrefix.dye;

DRYER = recipemap('dryer')
BCR = recipemap('bubble_column_reactor')
ELECTROLYTIC_CELL = recipemap('electrolytic_cell')
FLUID_SOLIDIFIER = recipemap('fluid_solidifier')
MIXER = recipemap('mixer')
DISTILLERY = recipemap('distillery')
VACUUM_DT = recipemap('vacuum_distillation')
TUBE_FURNACE = recipemap('tube_furnace')
CLARIFIER = recipemap('clarifier')
BR = recipemap('batch_reactor')
VACUUM_FREEZER = recipemap('vacuum_freezer')
PHASE_SEPARATOR = recipemap('phase_separator')
SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT = recipemap('single_column_cryogenic_distillation')

//Molten Salt Method


ELECTROLYTIC_CELL.recipeBuilder()
.inputs(metaitem("graphite_electrode"))
.notConsumable(metaitem('stickMolybdenum'))
.notConsumable(metaitem('crucible.graphite'))
.fluidInputs(fluid('lithium_chloride') * 576)
.fluidInputs(fluid('moist_argon') * 1000)
.fluidOutputs(fluid('impure_lithium_carbonate') * 1008)
.fluidOutputs(fluid('acidic_argon_hydrogen_mixture') * 2000)
.duration(600)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

FLUID_SOLIDIFIER.recipeBuilder()
.notConsumable(metaitem('shape.mold.ball'))
.fluidInputs(fluid('impure_lithium_carbonate') * 144)
.outputs(metaitem('dustImpureLithiumCarbonate'))
.duration(80)
.EUt(16)
.buildAndRegister()

MIXER.recipeBuilder()
.inputs(ore('dustImpureLithiumCarbonate') * 7)
.fluidInputs(fluid('distilled_water') * 1000)
.fluidOutputs(fluid('impure_lithium_carbonate_solution') * 1000)
.duration(80)
.EUt(Globals.voltAmps[2])
.buildAndRegister()

CLARIFIER.recipeBuilder()
.fluidInputs(fluid('impure_lithium_carbonate_solution') * 10000)
.outputs(metaitem('dustWashedGraphene') * 10)
.fluidOutputs(fluid('lithium_carbonate_solution') * 10000)
.duration(160)
.EUt(Globals.voltAmps[2])
.buildAndRegister()

VACUUM_DT.recipeBuilder()
.inputs(ore('dustWashedGraphene'))
.outputs(metaitem('dustDistilledGraphene'))
.duration(20)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

DRYER.recipeBuilder()
.inputs(ore('dustDistilledGraphene'))
.outputs(metaitem('dustDriedGraphene'))
.duration(400)
.EUt(Globals.voltAmps[2])
.buildAndRegister()

TUBE_FURNACE.recipeBuilder()
.inputs(ore('dustDriedGraphene'))
.fluidInputs(fluid('nitrogen') * 500)
.outputs(metaitem('dustGraphene'))
.duration(200)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

TUBE_FURNACE.recipeBuilder()
.inputs(ore('dustDriedGraphene'))
.fluidInputs(fluid('argon') * 50)
.outputs(metaitem('dustGraphene'))
.duration(100)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

DISTILLERY.recipeBuilder()
.fluidInputs(fluid('lithium_carbonate_solution') * 1000)
.outputs(metaitem('gregtechfoodoption:lithium_carbonate_dust') * 6)
.fluidOutputs(fluid('water') * 1000)
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister()

//Argon preparation and recycling

BCR.recipeBuilder()
.fluidInputs(fluid('argon') * 50)
.fluidInputs(fluid('water') * 50)
.fluidOutputs(fluid('moist_argon') * 100)
.duration(2)
.EUt(16)
.buildAndRegister()

BR.recipeBuilder()
.fluidInputs(fluid('acidic_argon_hydrogen_mixture') * 1000)
.fluidInputs(fluid('ammonia') * 2000)
.outputs(metaitem('dustAmmoniumChloride') * 6)
.fluidOutputs(fluid('ammoniacal_argon_hydrogen_mixture') * 2000)
.duration(100)
.EUt(Globals.voltAmps[2])
.buildAndRegister()

VACUUM_FREEZER.recipeBuilder()
.fluidInputs(fluid('ammoniacal_argon_hydrogen_mixture') * 1000)
.fluidOutputs(fluid('cold_ammoniacal_argon_hydrogen_mixture') * 875)
.duration(200)
.EUt(60)
.buildAndRegister()

PHASE_SEPARATOR.recipeBuilder()
.fluidInputs(fluid('cold_ammoniacal_argon_hydrogen_mixture') * 875)
.fluidOutputs(fluid('cold_ammonia') * 500)
.fluidOutputs(fluid('cold_argon_hydrogen_mixture') * 320)
.duration(20)
.buildAndRegister()

VACUUM_FREEZER.recipeBuilder()
.fluidInputs(fluid('cold_argon_hydrogen_mixture') * 1280)
.fluidOutputs(fluid('partially_liquefied_argon_hydrogen_mixture') * 1000)
.duration(200)
.EUt(Globals.voltAmps[3])
.buildAndRegister();

SINGLE_COLUMN_CRYOGENIC_DISTILLATION_PLANT.recipeBuilder()
.fluidInputs(fluid('partially_liquefied_argon_hydrogen_mixture') * 16000)
.fluidOutputs(fluid('liquid_argon') * 125)
.fluidOutputs(fluid('hydrogen') * 16000)
.duration(40)
.EUt(Globals.voltAmps[3])
.buildAndRegister()
20 changes: 20 additions & 0 deletions resources/langfiles/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,10 @@ susy.material.hp_benzene=High-Pressure Benzene
susy.material.hot_hp_carbon_monoxide=Hot High-Pressure Carbon Monoxide
susy.material.hp_carbon_monoxide=High-Pressure Carbon Monoxide

susy.material.hot_hp_argon_hydrogen_mixture=Hot High Pressure Argon-Hydrogen Mixture
susy.material.hp_argon_hydrogen_mixture=High Pressure Argon Hydrogen Mixture
susy.material.cold_hp_argon_hydrogen_mixture=Cold High Pressure Argon Hydrogen Mixture

susy.material.liquid_hydrogen=Liquid Hydrogen
susy.material.liquid_helium=Liquid Helium
susy.material.liquid_neon=Liquid Neon
Expand Down Expand Up @@ -1982,6 +1986,22 @@ susy.material.cryogenic_solder=Cryogenic Solder
susy.material.oxidized_manganate_solution=Oxidized Manganate Solution
susy.material.galvanized_steel=Galvanized Steel

# Graphene Chain
susy.material.moist_argon=Moist Argon
susy.material.argon_hydrogen_mixture=Argon Hydrogen Mixture
susy.material.ammoniacal_argon_hydrogen_mixture=Ammoniacal Argon Hydrogen Mixture
susy.material.acidic_argon_hydrogen_mixture=Acidic Argon Hydrogen Mixture
susy.material.partially_liquefied_argon_hydrogen_mixture=Partially Liquefied Argon Hydrogen Mixture
susy.material.cold_ammoniacal_argon_hydrogen_mixture=Cold Ammoniacal Argon Hydrogen Mixture
susy.material.cold_argon_hydrogen_mixture=Cold Argon Hydrogen Mixture
susy.material.lithium_carbonate_solution=Lithium Carbonate Solution
susy.material.impure_lithium_carbonate_solution=Impure Lithium Carbonate Solution

susy.material.impure_lithium_carbonate=Impure Lithium Carbonate
susy.material.washed_graphene=Washed Graphene
susy.material.distilled_graphene=Distilled Graphene
susy.material.dried_graphene=Dried Graphene

# Isotopes

# GregTech RecipeMaps
Expand Down

0 comments on commit 870e2ef

Please sign in to comment.