Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Epoxy #538

Merged
merged 16 commits into from
Sep 13, 2023
Merged

Epoxy #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
660c37b
initial commit
planetme Sep 3, 2023
2932c5a
epoxy recipes
planetme Sep 6, 2023
55e0074
aromatics rebalance
planetme Sep 6, 2023
bab9dce
buff WF recycling
planetme Sep 8, 2023
de303f3
le fixe de bug
planetme Sep 8, 2023
d8d0e34
fix alcl3 duplicate
planetme Sep 9, 2023
cf79ede
fix kroll stoich
planetme Sep 9, 2023
608cd81
transfer progress
planetme Sep 10, 2023
c6ee588
Merge remote-tracking branch 'upstream/master-ceu' into epoxy
planetme Sep 11, 2023
427a89c
finish everything
planetme Sep 12, 2023
ad6f815
le fix au chocolat
planetme Sep 12, 2023
0143337
fix everything
planetme Sep 13, 2023
fae6e0f
some fixes
planetme Sep 13, 2023
98ec54e
add a funny recipe
planetme Sep 13, 2023
3151c15
fix
swagXDragonSlayer46YT Sep 13, 2023
55f4a73
Merge branch 'epoxy' of https://github.com/planetme/Supersymmetry int…
swagXDragonSlayer46YT Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 43 additions & 10 deletions groovy/material/FirstDegreeMaterials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,12 +854,11 @@ public class FirstDegreeMaterials{
.colorAverage()
.build()

AluminiumTrichloride = new Material.Builder(8214, "aluminium_trichloride")
ManganeseIISulfate = new Material.Builder(8214, "manganese_ii_sulfate")
.dust()
.components(Aluminium, 1, Chlorine, 3)
.flags(GENERATE_CATALYST_BED)
.components(Manganese, 1, Sulfur, 1, Oxygen, 4)
.colorAverage()
.build()
.build();

Triethylaluminium = new Material.Builder(8215, "triethylaluminium")
.fluid()
Expand Down Expand Up @@ -1024,7 +1023,7 @@ public class FirstDegreeMaterials{

AluminiumChloride = new Material.Builder(8242, "aluminium_chloride")
.dust().fluid(FluidTypes.GAS)
.flags(NO_UNIFICATION)
.flags(NO_UNIFICATION, GENERATE_CATALYST_BED)
.fluidTemp(460)
.components(Aluminium, 1, Chlorine, 3)
.colorAverage()
Expand Down Expand Up @@ -1643,7 +1642,7 @@ public class FirstDegreeMaterials{
.fluidTemp(600)
.components(Lead, 1)
.color(0x1f1926)
.flags(GENERATE_PLATE)
.flags(GENERATE_PLATE, DISABLE_DECOMPOSITION)
.build();

SilverFreeLead = new Material.Builder(8338, "silver_free_lead")
Expand Down Expand Up @@ -1726,6 +1725,7 @@ public class FirstDegreeMaterials{
BettsCrudeLead = new Material.Builder(8350, "betts_crude_lead")
.fluid().ingot()
.components(Bismuth, 3, Lead, 6, Copper, 1)
.flags(DISABLE_DECOMPOSITION)
.color(0x393673)
.build();

Expand Down Expand Up @@ -2708,10 +2708,10 @@ public class FirstDegreeMaterials{
.color(0x887866)
.build();

GaseousAluminiumTrichloride = new Material.Builder(8496, "gaseous_aluminium_trichloride")
GaseousAluminiumChloride = new Material.Builder(8496, "gaseous_aluminium_chloride")
.fluid(FluidTypes.GAS)
.fluidTemp(460)
.components(AluminiumTrichloride, 1)
.components(AluminiumChloride, 1)
.colorAverage()
.build();

Expand Down Expand Up @@ -3202,10 +3202,43 @@ public class FirstDegreeMaterials{
.colorAverage()
.build();

ManganeseIISulfate = new Material.Builder(8566, "manganese_ii_sulfate")
NickelHydrotalcite = new Material.Builder(8566, "nickel_hydrotalcite")
.dust()
.components(Manganese, 1, Sulfur, 1, Oxygen, 4)
.components(Nickel, 6, Aluminium, 2, )
.color(0x9fb833)
.build();

NickelHydrotalcite.setFormula("[Ni3Al(OH)8]Cl", true)

CalciumCyanamide = new Material.Builder(8567, "calcium_cyanamide")
.dust()
.components(Calcium, 1, Carbon, 1, Nitrogen, 2)
.colorAverage()
.build();

AntimonyPentafluoride = new Material.Builder(8568, "antimony_pentafluoride")
.fluid()
.components(Antimony, 1, Fluorine, 5)
.colorAverage()
.build();

SodiumHexafluoroantimonate = new Material.Builder(8569, "sodium_hexafluoroantimonate")
.dust()
.components(Sodium, 1, Antimony, 1, Fluorine, 6)
.colorAverage()
.build();

AcidWashedSiliconDioxide = new Material.Builder(8570, "acid_washed_silicon_dioxide")
.dust()
.components(SiliconDioxide, 1)
.color(0xc8c8c8)
.iconSet(SHINY)
.build();

DisulfurDichloride = new Material.Builder(8571, "disulfur_dichloride")
.fluid()
.components(Sulfur, 2, Chlorine, 2)
.color(0xccc31d)
.build();
}
}
81 changes: 74 additions & 7 deletions groovy/material/OrganicChemistryMaterials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ public class OrganicChemistryMaterials {
.color(0x917b0f)
.build();

SodiumPhenoxideSolution = new Material.Builder(15050, 'sodium_phenoxide_solution')
Cyclohexylamine = new Material.Builder(15050, "cyclohexylamine")
.fluid()
.components(Water, 1, SodiumPhenoxide, 1)
.colorAverage()
.components(Carbon, 6, Hydrogen, 13, Nitrogen, 1)
.color(0xbfba8c)
.build();

DiphenylIsophthalateSolution = new Material.Builder(15051, 'diphenyl_isophthalate_solution')
Expand Down Expand Up @@ -934,7 +934,7 @@ public class OrganicChemistryMaterials {
Kevlar = new Material.Builder(15154, 'kevlar')
.polymer(3)
.color(0x4d443e)
.flags(GENERATE_PLATE)
.flags(GENERATE_PLATE, GENERATE_FINE_WIRE)
.build()

Kevlar.setFormula("COC6H4CONHC6H4NH", true)
Expand Down Expand Up @@ -1695,10 +1695,77 @@ public class OrganicChemistryMaterials {
.color(0x8fa32a)
.build();

Cyclohexylamine = new Material.Builder(15272, "cyclohexylamine")
TetrabromobisphenolA = new Material.Builder(15272, "tetrabromobisphenol_a")
.dust()
.components(Carbon, 15, Hydrogen, 12, Bromine, 4, Oxygen, 2)
.color(0x6b3220)
.build();

Cyanamide = new Material.Builder(15273, "cyanamide")
.dust()
.components(Carbon, 1, Hydrogen, 2, Nitrogen, 2)
.colorAverage()
.build();

Dicyandiamide = new Material.Builder(15274, "dicyandiamide")
.dust()
.components(Carbon, 2, Hydrogen, 4, Nitrogen, 4)
.colorAverage()
.iconSet(QUARTZ)
.build();

TwoMethylimidazole = new Material.Builder(15275, "two_methylimidazole")
.dust()
.components(Carbon, 4, Hydrogen, 6, Nitrogen, 2)
.colorAverage()
.build();

FlameRetardantEpoxy = new Material.Builder(15276, "flame_retardant_epoxy")
.dust().fluid()
.components(Carbon, 21, Hydrogen, 21, Bromine, 4, Chlorine, 1, Oxygen, 5)
.color(0xc86b14)
.build();

PropyleneChlorohydrin = new Material.Builder(15277, "propylene_chlorohydrin")
.fluid()
.components(Carbon, 6, Hydrogen, 13, Nitrogen, 1)
.color(0xbfba8c)
.components(Carbon, 3, Hydrogen, 7, Chlorine, 1, Oxygen, 1)
.colorAverage()
.build();

PropyleneOxide = new Material.Builder(15278, "propylene_oxide")
.fluid()
.components(Carbon, 3, Hydrogen, 6, Oxygen, 1)
.color(0x9ab522)
.build();

PropyleneCarbonate = new Material.Builder(15279, "propylene_carbonate")
.fluid()
.components(Carbon, 4, Hydrogen, 6, Oxygen, 3)
.color(0x5db522)
.build();

DiphenylSulfide = new Material.Builder(15280, "diphenyl_sulfide")
.dust()
.components(Carbon, 12, Hydrogen, 10, Sulfur, 1)
.color(0x5e5c0a)
.build();

DiphenylSulfoxide = new Material.Builder(15281, "diphenyl_sulfoxide")
.dust()
.components(Carbon, 12, Hydrogen, 10, Oxygen, 1, Sulfur, 1)
.color(0x435e0a)
.build();

MethanesulfonicAcid = new Material.Builder(15282, "methanesulfonic_acid")
.fluid()
.components(Carbon, 1, Hydrogen, 4, Oxygen, 3, Sulfur, 1)
.color(0xff6e6e)
.build();

TriarylsulfoniumHexafluoroantimonate = new Material.Builder(15283, "triarylsulfonium_hexafluoroantimonate")
.dust()
.components(Carbon, 24, Hydrogen, 19, Fluorine, 6, Sulfur, 2, Antimony, 1)
.color(0x31a374)
.build();
}
}
18 changes: 18 additions & 0 deletions groovy/material/SecondDegreeMaterials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,5 +535,23 @@ public class SecondDegreeMaterials {
.components(AluminiumChloride, 1, Water, 3)
.colorAverage()
.build();

DilutedSodiumSulfiteSolution = new Material.Builder(13086, "diluted_sodium_sulfite_solution")
.fluid()
.components(SodiumSulfite, 1, Water, 14)
.color(0x75745a)
.build();

SodiumHexafluoroantimonateSolution = new Material.Builder(13087, "sodium_hexafluoroantimonate_solution")
.fluid()
.components(SodiumHexafluoroantimonate, 1, HydrogenFluoride, 1)
.colorAverage()
.build();

EGlass = new Material.Builder(13088, "e_glass")
.dust().fluid()
.components(SiliconDioxide, 6, Alumina, 1, BoronTrioxide, 1, Quicklime, 2)
.color(0x778f8b)
.build();
}
}
39 changes: 35 additions & 4 deletions groovy/material/SuSyMaterials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class SuSyMaterials {
public static Material ImpureLithiumSulfateSolution;
public static Material GalenaByproductsSlurry;
public static Material SinteredLeadConcentrate;
public static Material CadmiumRichFlueDust;
public static Material CadmiumRichFlue;
public static Material BlackMetal;
public static Material AntimonyArsenicFlueDust;
public static Material BurnedBlackMetal;
Expand Down Expand Up @@ -359,7 +359,7 @@ class SuSyMaterials {
public static Material UltramaficTailingSlurry;
public static Material GaseousIronIIIChloride;
public static Material GaseousTitaniumTetrachloride;
public static Material GaseousAluminiumTrichloride;
public static Material GaseousAluminiumChloride;
public static Material DirtyMolecularSieve;
public static Material OligomericBisphenolSolution;
public static Material ImpureBariteSlurry;
Expand Down Expand Up @@ -466,6 +466,12 @@ class SuSyMaterials {
public static Material HZSMFive;
public static Material FunctionalizableCrosslinkedPolystyrene;
public static Material TantalumExtract;
public static Material BisphenolBrominationCatalyst;
public static Material ImpureBrominatedBisphenolEmulsion;
public static Material ImpureBrominatedBisphenolSolution;
public static Material BisphenolANovolacEpoxy;
public static Material SulfoniumPreparationMixture;
public static Material SuEight;

// Petrochem Materials

Expand Down Expand Up @@ -651,7 +657,6 @@ class SuSyMaterials {
public static Material ImpregnatedAluminaCatalyst;
public static Material BismuthCopper;
public static Material Bromobenzene;
public static Material AluminiumTrichloride;
public static Material Triethylaluminium;
public static Material HydrogenPeroxide;
public static Material Tetrabromomethane;
Expand Down Expand Up @@ -987,6 +992,12 @@ class SuSyMaterials {
public static Material ActivatedRaneyCobalt;
public static Material LithiumOxide;
public static Material ManganeseIISulfate;
public static Material NickelHydrotalcite;
public static Material CalciumCyanamide;
public static Material AntimonyPentafluoride;
public static Material SodiumHexafluoroantimonate;
public static Material AcidWashedSiliconDioxide;
public static Material DisulfurDichloride;

// Second Degree Materials

Expand Down Expand Up @@ -1075,6 +1086,9 @@ class SuSyMaterials {
public static Material TantalumFluorideSolution;
public static Material AmmoniumPerrhenateSolution;
public static Material AluminiumChlorideSolution;
public static Material DilutedSodiumSulfiteSolution;
public static Material SodiumHexafluoroantimonateSolution;
public static Material EGlass;

// Organic Chemistry Materials

Expand Down Expand Up @@ -1119,7 +1133,6 @@ class SuSyMaterials {
public static Material Xylene;
public static Material Phosgene;
public static Material PhthaloylDichlorideSolution;
public static Material SodiumPhenoxideSolution;
public static Material DiphenylIsophthalateSolution;
public static Material DiaminobenzidineSolution;
public static Material PBIPolymerizationMix;
Expand Down Expand Up @@ -1354,6 +1367,18 @@ class SuSyMaterials {
public static Material Ethyltoluene;
public static Material VinylbenzylChloride;
public static Material Cyclohexylamine;
public static Material TetrabromobisphenolA;
public static Material Cyanamide;
public static Material Dicyandiamide;
public static Material TwoMethylimidazole;
public static Material FlameRetardantEpoxy;
public static Material PropyleneChlorohydrin;
public static Material PropyleneOxide;
public static Material PropyleneCarbonate;
public static Material DiphenylSulfide;
public static Material DiphenylSulfoxide;
public static Material MethanesulfonicAcid;
public static Material TriarylsulfoniumHexafluoroantimonate;

// Third Degree Materials

Expand Down Expand Up @@ -1410,6 +1435,12 @@ class SuSyMaterials {
public static Material CrudeNitrobenzene;
public static Material DichlorobistriphenylphosphinenickelII;
public static Material DicarbonylbistriphenylphosphinenickelZero;
public static Material SodiumPhenoxideSolution;
public static Material WetEpoxy;
public static Material TetrabromobisphenolASolution;
public static Material EpoxyCuringMixture;
public static Material WetFlameRetardantEpoxy;
public static Material PropyleneOxideSolution;

// Thermodynamics/Greenhouse Materials

Expand Down
36 changes: 36 additions & 0 deletions groovy/material/ThirdDegreeMaterials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,5 +338,41 @@ public class ThirdDegreeMaterials {
.build();

DicarbonylbistriphenylphosphinenickelZero.setFormula("Ni(CO)2(PPh)2", true)

SodiumPhenoxideSolution = new Material.Builder(24053, 'sodium_phenoxide_solution')
.fluid()
.components(Water, 1, SodiumPhenoxide, 1)
.colorAverage()
.build();

WetEpoxy = new Material.Builder(24054, 'wet_epoxy')
.dust()
.components(Epoxy, 1)
.color(0xa16f0d)
.build();

TetrabromobisphenolASolution = new Material.Builder(24055, 'tetrabromobisphenol_a_solution')
.fluid()
.components(TetrabromobisphenolA, 1, Dichloroethane, 6)
.colorAverage()
.build();

EpoxyCuringMixture = new Material.Builder(24056, 'epoxy_curing_mixture')
.dust()
.components(Dicyandiamide, 1, TwoMethylimidazole, 1, PhthalicAnhydride, 1)
.colorAverage()
.build();

WetFlameRetardantEpoxy = new Material.Builder(24057, 'wet_flame_retardant_epoxy')
.dust()
.components(FlameRetardantEpoxy, 1)
.color(0xa1530b)
.build();

PropyleneOxideSolution = new Material.Builder(24058, 'propylene_oxide_solution')
.fluid()
.components(CalciumChloride, 1, PropyleneOxide, 2, Water, 2)
.colorAverage()
.build();
}
}
Loading