Skip to content

Commit

Permalink
Merge pull request #679 from SymmetricDevs/ore-processing-refactoring-2
Browse files Browse the repository at this point in the history
  • Loading branch information
planetme authored Jan 5, 2024
2 parents 92716ce + 5be9e14 commit 0ce61db
Show file tree
Hide file tree
Showing 15 changed files with 84 additions and 522 deletions.
13 changes: 13 additions & 0 deletions groovy/classes/ChangeFlags.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ class ChangeFlags {
Tantalite.setFormula("(Fe,Mn)Ta2O6", true);

Borax.setProperty(PropertyKey.ORE, new OreProperty());
Scheelite.addFlags("generate_sifted", "generate_slurries", "generate_flotated");
Pyrochlore.addFlags("generate_sifted", "generate_slurries", "generate_flotated", "generate_concentrate");
Molybdenite.addFlags("generate_flotated", "generate_slurries");
Tantalite.addFlags("generate_sifted", "generate_slurries", "generate_flotated", "generate_concentrate");
Galena.addFlags("generate_slurries");
Cinnabar.addFlags("generate_slurries");
Ilmenite.addFlags("generate_flotated", "generate_slurries", "generate_concentrate");
Barite.addFlags("generate_slurries");
Spodumene.addFlags("generate_slurries");
Cassiterite.addFlags("generate_slurries", "generate_concentrate");
Malachite.addFlags("generate_slurries");
Rutile.addFlags("generate_concentrate");
Sphalerite.addFlags("generate_slurries");

Asbestos.setProperty(PropertyKey.INGOT, new IngotProperty());
Asbestos.addFlags("generate_foil");
Expand Down
41 changes: 3 additions & 38 deletions groovy/material/FirstDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1696,11 +1696,7 @@ public class FirstDegreeMaterials{
.color(0x2c733a)
.build();

ImpureGalenaSlurry = new Material.Builder(8346, SuSyUtility.susyId('impure_galena_slurry'))
.fluid()
.components(Galena, 2, Water, 1)
.colorAverage()
.build();
//FREE ID: 8346

CopperDross = new Material.Builder(8347, SuSyUtility.susyId('copper_dross'))
.dust()
Expand Down Expand Up @@ -1787,12 +1783,7 @@ public class FirstDegreeMaterials{
.colorAverage()
.build();

CassiteriteConcentrate = new Material.Builder(8360, SuSyUtility.susyId('cassiterite_concentrate'))
.dust()
.components(Cassiterite, 1)
.colorAverage()
.iconSet(SHINY)
.build();
//FREE ID: 8360

CrudeTin = new Material.Builder(8361, SuSyUtility.susyId('crude_tin'))
.fluid()
Expand Down Expand Up @@ -2635,13 +2626,6 @@ public class FirstDegreeMaterials{
.colorAverage()
.build();

RutileConcentrate = new Material.Builder(8485, SuSyUtility.susyId('rutile_concentrate'))
.dust()
.components(Rutile, 1)
.color(0x503f3e)
.build();

RutileConcentrate.setFormula("(TiO2)(?)", true);

UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry'))
.fluid()
Expand Down Expand Up @@ -2984,26 +2968,7 @@ public class FirstDegreeMaterials{
.colorAverage()
.build();

SiftedZircon = new Material.Builder(8535, SuSyUtility.susyId('sifted_zircon'))
.dust()
.components(Zircon, 1)
.colorAverage()
.iconSet(SAND)
.build();

FlotatedZircon = new Material.Builder(8536, SuSyUtility.susyId('flotated_zircon'))
.dust()
.components(Zircon, 1)
.colorAverage()
.iconSet(QUARTZ)
.build();

ZirconConcentrate = new Material.Builder(8537, SuSyUtility.susyId('zircon_concentrate'))
.dust()
.components(Zircon, 1)
.colorAverage()
.iconSet(DULL)
.build();
//FREE IDs: 8535-8537

FusedZirconia = new Material.Builder(8538, SuSyUtility.susyId('fused_zirconia'))
.dust()
Expand Down
12 changes: 7 additions & 5 deletions groovy/material/OreMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class OreMaterials{

VanadiferousTitanomagnetite = new Material.Builder(7006, SuSyUtility.susyId('vanadiferous_titanomagnetite'))
.dust().ore()
.flags(NO_SMELTING)
.flags(NO_SMELTING, GENERATE_SLURRIES, GENERATE_FLOTATED)
.color(0x87685c)
.components(Vanadium, 1, Iron, 1, Titanium, 1, Oxygen, 4)
.build()
Expand Down Expand Up @@ -102,14 +102,14 @@ public class OreMaterials{

Cerussite = new Material.Builder(7009, SuSyUtility.susyId('cerussite'))
.dust().ore()
.flags(NO_SMELTING)
.flags(NO_SMELTING, GENERATE_SLURRIES)
.color(0xe0d9ba)
.components(Lead, 1, Carbon, 1, Oxygen, 3)
.build();

Anglesite = new Material.Builder(7010, SuSyUtility.susyId('anglesite'))
.dust().ore()
.flags(NO_SMELTING)
.flags(NO_SMELTING, GENERATE_SLURRIES)
.color(0xe0ded5)
.components(Lead, 1, Sulfur, 1, Oxygen, 4)
.build();
Expand All @@ -124,7 +124,7 @@ public class OreMaterials{

Smithsonite = new Material.Builder(7012, SuSyUtility.susyId('smithsonite'))
.dust().ore()
.flags(NO_SMELTING)
.flags(NO_SMELTING, GENERATE_SLURRIES)
.color(0x6aadab)
.components(Zinc, 1, Carbon, 1, Oxygen, 3)
.build();
Expand Down Expand Up @@ -194,7 +194,7 @@ public class OreMaterials{

Wolframite = new Material.Builder(7021, SuSyUtility.susyId('wolframite'))
.dust().ore()
.flags(NO_SMELTING)
.flags(NO_SMELTING, GENERATE_SIFTED, GENERATE_SLURRIES, GENERATE_FLOTATED)
.color(0x1e1c36)
.components(Iron, 1, Manganese, 1, Tungsten, 1, Oxygen, 4)
.build()
Expand Down Expand Up @@ -367,6 +367,7 @@ public class OreMaterials{
Zircon = new Material.Builder(7047, SuSyUtility.susyId('zircon'))
.gem().ore()
.iconSet(SHINY)
.flags(GENERATE_SIFTED, GENERATE_FLOTATED, GENERATE_SLURRIES, GENERATE_CONCENTRATE)
.color(0xf05c51)
.components(Zirconium, 1, Silicon, 1, Oxygen, 4)
.build();
Expand Down Expand Up @@ -463,6 +464,7 @@ public class OreMaterials{
.ore().dust()
.color(0x574f2f)
.iconSet(SHINY)
.flags(GENERATE_SIFTED, GENERATE_FLOTATED, GENERATE_SLURRIES, GENERATE_CONCENTRATE)
.components(Iron, 1, Manganese, 1, Niobium, 2, Oxygen, 6)
.build()
.setFormula('(Fe,Mn)Nb2O6', true);
Expand Down
63 changes: 3 additions & 60 deletions groovy/material/SuSyMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@ class SuSyMaterials {
public static Material TearGas;
public static Material HydratedPropene;
public static Material EthylamineMix;
public static Material ImpureSphaleriteSlurry;
public static Material UnprocessedSphaleriteSlurry;
public static Material SphaleriteSlurry;
public static Material ThalliumRichFlue;
public static Material CrudeZinc;
public static Material CadmiumRichZinc;
Expand Down Expand Up @@ -328,10 +326,7 @@ class SuSyMaterials {
public static Material ImpurePotashSlurry;
public static Material PotashSlurry;
public static Material SupersaturatedBrine;
public static Material ImpureVTMSlurry;
public static Material VTMSlurry;
public static Material SiliconDioxideSlurry;
public static Material VTMConcentrate;
public static Material VTSlag;
public static Material AlkaliVTSlag;
public static Material TitaniaSlag;
Expand All @@ -357,39 +352,22 @@ class SuSyMaterials {
public static Material CesiumMolecularSieve;
public static Material SaturatedPotassiumMolecularSieve;
public static Material SaturatedCesiumMolecularSieve;
public static Material ImpureIlmeniteSlurry;
public static Material ImpureIlmeniteConcentrate;
public static Material IlmeniteSlurry;
public static Material AcidicWastewater;
public static Material ImpureTitaniumTetrachloride;
public static Material DistilledTitaniumTetrachloride;
public static Material VanadiumFreeTitaniumTetrachloride;
public static Material RutileConcentrate;
public static Material UltramaficTailingSlurry;
public static Material GaseousIronIIIChloride;
public static Material GaseousTitaniumTetrachloride;
public static Material GaseousAluminiumChloride;
public static Material DirtyMolecularSieve;
public static Material OligomericBisphenolSolution;
public static Material ImpureBariteSlurry;
public static Material BariteSlurry;
public static Material GraniteTailingSlurry;
public static Material GalenaSlurry;
public static Material ByproductSphaleriteSlurry;
public static Material ImpureCerussiteSlurry;
public static Material CerussiteSlurry;
public static Material ImpureAnglesiteSlurry;
public static Material AnglesiteSlurry;
public static Material ImpureSpodumeneSlurry;
public static Material SpodumeneSlurry;
public static Material SphaleriteByproductSlurry;
public static Material PegmatiteTailingSlurry;
public static Material FilteredPhosphateSlurry;
public static Material PhosphateConcentrateSlurry;
public static Material ImpureCassiteriteSlurry;
public static Material CassiteriteSlurry;
public static Material LimestoneTailingSlurry;
public static Material ImpureMalachiteSlurry;
public static Material MalachiteSlurry;
public static Material ImpureChalcopyriteSlurry;
public static Material ChalcopyriteSlurry;
public static Material ImpureBorniteSlurry;
Expand All @@ -406,42 +384,23 @@ class SuSyMaterials {
public static Material CopperMatteFlueGas;
public static Material CopperConcentrate;
public static Material PalladiumContainingSolution;
public static Material ImpureCinnabarSlurry;
public static Material CinnabarSlurry;
public static Material ChlorofluoromethaneMix;
public static ImpureZirconSlurry;
public static ZirconSlurry;
public static HafniumExtractionMixture;
public static HafniumExtract;
public static Material HafniumExtractionMixture;
public static Material HafniumExtract;
public static Material PropanalMixture;
public static Material ZSMFive;
public static Material AminatedEthyleneMixture;
public static Material NeutralizedAminatedEthyleneMixture;
public static Material SiftedPyrochlore;
public static Material PyrochloreConcentrate;
public static Material ImpurePyrochloreSlurry;
public static Material PyrochloreSlurry;
public static Material FlotatedPyrochlore;
public static Material RoastedPyrochlore;
public static Material DigestedPyrochlore;
public static Material ImpureNiobiumPentachloride;
public static Material SiftedColumbite;
public static Material ColumbiteConcentrate;
public static Material ImpureColumbiteSlurry;
public static Material ColumbiteSlurry;
public static Material FlotatedColumbite;
public static Material ImpureFluoroniobicAcidSolution;
public static Material NiobiumRichExtract;
public static Material MetalSulfateWaste;
public static Material ScrubbedNiobiumRichExtract;
public static Material DilutedTantalumExtract;
public static Material FluoroniobicAcidSolution;
public static Material DilutedNiobiumExtract;
public static Material SiftedTantalite;
public static Material TantaliteConcentrate;
public static Material ImpureTantaliteSlurry;
public static Material TantaliteSlurry;
public static Material FlotatedTantalite;
public static Material ImpureFluorotantalicAcidSolution;
public static Material TantalumRichExtract;
public static Material ScrubbedTantalumRichExtract;
Expand All @@ -450,24 +409,13 @@ class SuSyMaterials {
public static Material RheniumRichFlue;
public static Material ScrubbedPerrhenateSolution;
public static Material AlphaOlefinMixture;
public static Material SiftedScheelite;
public static Material ImpureScheeliteSlurry;
public static Material ScheeliteSlurry;
public static Material FlotatedScheelite;
public static Material CalcinedScheelite;
public static Material SiftedWolframite;
public static Material ImpureWolframiteSlurry;
public static Material WolframiteSlurry;
public static Material FlotatedWolframite;
public static Material SilicateFreeTungstateSolution;
public static Material MolybdenumFreeTungstateSolution;
public static Material IsodecanalMixture;
public static Material TungstenExtractionMixture;
public static Material TungstenExtract;
public static Material ScrubbedTungstenExtract;
public static Material ImpureMolybdeniteSlurry;
public static Material MolybdeniteSlurry;
public static Material FlotatedMolybdenite;
public static Material CopperMolybdeniteSlurry;
public static Material HZSMFive;
public static Material FunctionalizableCrosslinkedPolystyrene;
Expand Down Expand Up @@ -854,7 +802,6 @@ class SuSyMaterials {
public static Material BerylliumSulfateSolution;
public static Material AluminiumChloride;
public static Material PotassiumAlum;
public static Material ImpureGalenaSlurry;
public static Material CopperDross;
public static Material DecopperedLead;
public static Material DezincedLead;
Expand All @@ -868,7 +815,6 @@ class SuSyMaterials {
public static Material SaltyArsenicPentoxide;
public static Material TinIVOxide;
public static Material AntimonyVOxide;
public static Material CassiteriteConcentrate;
public static Material CrudeTin;
public static Material LeachedCassiteriteConcentrate;
public static Material AmmoniumTungstateSolution;
Expand Down Expand Up @@ -1021,9 +967,6 @@ class SuSyMaterials {
public static Material TitaniumIodide;
public static Material ZirconiumIodide;
public static Material HafniumIodide;
public static Material SiftedZircon;
public static Material FlotatedZircon;
public static Material ZirconConcentrate;
public static Material FusedZirconia;
public static Material ImpureZirconiumTetrachloride;
public static Material ZirconiumSulfateSolution;
Expand Down
Loading

0 comments on commit 0ce61db

Please sign in to comment.