From 9fcd83ec7c953d5e397c89845fecee3bf91cb9b6 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Tue, 7 May 2024 23:42:07 +0800 Subject: [PATCH 1/2] grs1.0.1 compat --- groovy/globals/CarbonGlobals.groovy | 2 + groovy/globals/GroovyUtils.groovy | 4 +- groovy/globals/SinteringGlobals.groovy | 2 + groovy/material/FirstDegreeMaterials.groovy | 946 +++++++++--------- groovy/material/OreMaterials.groovy | 142 +-- .../material/OrganicChemistryMaterials.groovy | 720 ++++++------- groovy/material/SecondDegreeMaterials.groovy | 206 ++-- .../material/ThermodynamicsMaterials.groovy | 42 +- groovy/material/ThirdDegreeMaterials.groovy | 198 ++-- .../chemistry/ChemistryOverhaul.groovy | 12 +- .../d_block/group10/NickelChain.groovy | 3 +- .../elements/d_block/group12/ZincChain.groovy | 4 +- .../d_block/group4/HafniumChain.groovy | 2 +- .../d_block/group4/TitaniumChain.groovy | 2 +- .../d_block/group4/ZirconiumChain.groovy | 6 +- .../d_block/group7/ManganeseChain.groovy | 17 +- .../elements/d_block/group8/IronChain.groovy | 42 +- .../d_block/group9/CobaltChain.groovy | 2 +- .../elements/p_block/group14/LeadChain.groovy | 4 +- .../elements/p_block/group14/TinChain.groovy | 2 +- .../p_block/group15/BismuthChain.groovy | 2 +- .../s_block/group1/CaesiumChain.groovy | 2 +- .../s_block/group2/MagnesiumChain.groovy | 4 +- .../CoalPyrolysisChain.groovy | 20 +- groovy/postInit/components/Batteries.groovy | 16 +- groovy/postInit/gameplay/Ores.groovy | 2 +- groovy/postInit/gameplay/vanilla.groovy | 6 +- .../metallurgy/StainlessSteelChain.groovy | 2 +- groovy/postInit/mod/GregTech.groovy | 2 +- groovy/prePostInit/ModifyRecipeMaps.groovy | 28 +- groovy/prePostInit/oreDict.groovy | 34 +- 31 files changed, 1241 insertions(+), 1235 deletions(-) diff --git a/groovy/globals/CarbonGlobals.groovy b/groovy/globals/CarbonGlobals.groovy index 8be3914a8..a4731272f 100644 --- a/groovy/globals/CarbonGlobals.groovy +++ b/groovy/globals/CarbonGlobals.groovy @@ -1,3 +1,5 @@ +package globals + import groovy.transform.TupleConstructor class CarbonGlobals { diff --git a/groovy/globals/GroovyUtils.groovy b/groovy/globals/GroovyUtils.groovy index 30082de49..cf900257e 100644 --- a/groovy/globals/GroovyUtils.groovy +++ b/groovy/globals/GroovyUtils.groovy @@ -1,3 +1,5 @@ +package globals + import net.minecraftforge.fluids.FluidStack; import gregtech.integration.groovy.VirtualizedRecipeMap; @@ -14,6 +16,4 @@ class GroovyUtils { return false }}).removeAll() } - - } \ No newline at end of file diff --git a/groovy/globals/SinteringGlobals.groovy b/groovy/globals/SinteringGlobals.groovy index ec4f330b8..d5009f0e4 100644 --- a/groovy/globals/SinteringGlobals.groovy +++ b/groovy/globals/SinteringGlobals.groovy @@ -1,3 +1,5 @@ +package globals + class SinteringGlobals { public static void main (String[] args) { diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 5f4ea6152..df8ff32d7 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -30,8 +30,8 @@ public class FirstDegreeMaterials { .iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .color(color) - .components(material, 1) - + .components(material) + if (generateLiquid) { builder.liquid(new FluidBuilder().temperature(determineTemperatureLiquid(material))) } @@ -127,51 +127,51 @@ public class FirstDegreeMaterials { CalciumHydroxide = new Material.Builder(8100, SuSyUtility.susyId('calcium_hydroxide')) .dust() - .components(Calcium, 1, Oxygen, 2, Hydrogen, 2) + .components(Calcium, Oxygen * 2, Hydrogen * 2) .color(0xcfcabc) .build() .setFormula("Ca(OH)2", true); PotassiumHydroxide = new Material.Builder(8101, SuSyUtility.susyId('potassium_hydroxide')) .dust().liquid(new FluidBuilder().temperature(683)) - .components(Potassium, 1, Oxygen, 1, Hydrogen, 1) + .components(Potassium, Oxygen, Hydrogen) .colorAverage() .build(); PotassiumCarbonate = new Material.Builder(8102, SuSyUtility.susyId('potassium_carbonate')) .dust().liquid(new FluidBuilder().temperature(1164)) - .components(Potassium, 2, Carbon, 1, Oxygen, 3) + .components(Potassium * 2, Carbon, Oxygen * 3) .colorAverage() .build(); SodiumSilicate = new Material.Builder(8103, SuSyUtility.susyId('sodium_silicate')) .dust() - .components(Sodium, 2, Silicon, 1, Oxygen, 3) + .components(Sodium * 2, Silicon, Oxygen * 3) .colorAverage() .build(); SodiumAluminate = new Material.Builder(8104, SuSyUtility.susyId('sodium_aluminate')) .dust() - .components(Sodium, 1, Aluminium, 1, Oxygen, 2) + .components(Sodium, Aluminium, Oxygen * 2) .colorAverage() .build(); PotassiumBisulfate = new Material.Builder(8105, SuSyUtility.susyId('potassium_bisulfate')) .dust().liquid(new FluidBuilder().temperature(470)) - .components(Potassium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4) + .components(Potassium, Hydrogen, Sulfur, Oxygen * 4) .colorAverage() .build(); AmmoniumNitrate = new Material.Builder(8107, SuSyUtility.susyId('ammonium_nitrate')) .dust() - .components(Nitrogen, 2, Oxygen, 3, Hydrogen, 4) + .components(Nitrogen * 2, Oxygen * 3, Hydrogen * 4) .colorAverage() .build() .setFormula("NH4NO3", true); AmmoniumSulfate = new Material.Builder(8108, SuSyUtility.susyId('ammonium_sulfate')) .dust() - .components(Nitrogen, 2, Hydrogen, 8, Sulfur, 1, Oxygen, 4) + .components(Nitrogen * 2, Hydrogen * 8, Sulfur, Oxygen * 4) .colorAverage() .build(); @@ -179,44 +179,44 @@ public class FirstDegreeMaterials { SodiumNitrate = new Material.Builder(8109, SuSyUtility.susyId('sodium_nitrate')) .dust().liquid(new FluidBuilder().temperature(581)) - .components(Sodium, 1, Nitrogen, 1, Oxygen, 3) + .components(Sodium, Nitrogen, Oxygen * 3) .colorAverage() .build(); SodiumFluoride = new Material.Builder(8110, SuSyUtility.susyId('sodium_fluoride')) .dust().liquid(new FluidBuilder().temperature(1266)) - .components(Sodium, 1, Fluorine, 1) + .components(Sodium, Fluorine) .colorAverage() .build(); PotassiumFluoride = new Material.Builder(8111, SuSyUtility.susyId('potassium_fluoride')) .dust().liquid(new FluidBuilder().temperature(1131)) - .components(Potassium, 1, Fluorine, 1) + .components(Potassium, Fluorine) .colorAverage() .build(); PotassiumTetrafluoroborate = new Material.Builder(8112, SuSyUtility.susyId('potassium_tetrafluoroborate')) .dust().liquid(new FluidBuilder().temperature(803)) - .components(Potassium, 1, Boron, 1, Fluorine, 4) + .components(Potassium, Boron, Fluorine * 4) .color(0x8fb5a3) .build(); SodiumBromide = new Material.Builder(8113, SuSyUtility.susyId('sodium_bromide')) .dust() - .components(Sodium, 1, Bromine, 1) + .components(Sodium, Bromine) .colorAverage() .build(); Fluix = new Material.Builder(8114, SuSyUtility.susyId('fluix')) .gem().iconSet(RUBY) .flags(DISABLE_DECOMPOSITION, GENERATE_PLATE, GENERATE_LENS) - .components(Quartzite, 4, Naquadah, 1) + .components(Quartzite * 4, Naquadah) .color(0x6503b6) .build(); PigIron = new Material.Builder(8115, SuSyUtility.susyId('pig_iron')) .ingot().dust() - .components(Iron, 1) + .components(Iron) .color(0x99918A) .build(); @@ -225,35 +225,35 @@ public class FirstDegreeMaterials { GreenCoke = new Material.Builder(8116, SuSyUtility.susyId('green_coke')) .gem(1, 2000).ore(2, 1) .color(0x424a34).iconSet(LIGNITE) - .components(Carbon, 1) + .components(Carbon) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); IronIIISulfate = new Material.Builder(8117, SuSyUtility.susyId('iron_iii_sulfate')) .dust() .color(0xb09d99) - .components(Iron, 2, Sulfur, 3, Oxygen, 12) + .components(Iron * 2, Sulfur * 3, Oxygen * 12) .flags(DECOMPOSITION_BY_ELECTROLYZING) .build() .setFormula("Fe2(SO4)3", true); AluminiumHydroxide = new Material.Builder(8118, SuSyUtility.susyId('aluminium_hydroxide')) .dust() - .components(Aluminium, 1, Oxygen, 3, Hydrogen, 3) + .components(Aluminium, Oxygen * 3, Hydrogen * 3) .colorAverage() .build() .setFormula("Al(OH)3", true); AluminiumTrifluoride = new Material.Builder(8119, SuSyUtility.susyId('aluminium_trifluoride')) .dust() - .components(Aluminium, 1, Fluorine, 3) + .components(Aluminium, Fluorine * 3) .color(0x3d98bf) .build() GalliumPhosphate = new Material.Builder(8120, SuSyUtility.susyId('gallium_phosphate')) .gem().iconSet(RUBY) .flags(CRYSTALLIZABLE) - .components(Gallium, 1, Phosphorus, 1, Oxygen, 4) + .components(Gallium, Phosphorus, Oxygen * 4) .colorAverage() .build() @@ -261,20 +261,20 @@ public class FirstDegreeMaterials { LithiumNiobate = new Material.Builder(8121, SuSyUtility.susyId('lithium_niobate')) .dust().gem().iconSet(RUBY) - .components(Lithium, 1, Niobium, 1, Oxygen, 3) + .components(Lithium, Niobium, Oxygen * 3) .color(0xbcabde) .build() LeadZirconateTitanate = new Material.Builder(8122, SuSyUtility.susyId('lead_zirconate_titanate')) .gem().iconSet(RUBY) - .components(Lead, 2, Zirconium, 1, Titanium, 1, Oxygen, 6) + .components(Lead * 2, Zirconium, Titanium, Oxygen * 6) .colorAverage() .build() BoricAcid = new Material.Builder(8123, SuSyUtility.susyId('boric_acid')) .dust() .color(0xedece8) - .components(Hydrogen, 3, Boron, 1, Oxygen, 3) + .components(Hydrogen * 3, Boron, Oxygen * 3) .build() AmorphousBoron = new Material.Builder(8124, SuSyUtility.susyId('amorphous_boron')) @@ -284,117 +284,117 @@ public class FirstDegreeMaterials { SulfurDichloride = new Material.Builder(8125, SuSyUtility.susyId('sulfur_dichloride')) .liquid() - .components(Sulfur, 1, Chlorine, 2) + .components(Sulfur, Chlorine * 2) .color(0xd2042d) .build() BoronTrioxide = new Material.Builder(8126, SuSyUtility.susyId('boron_trioxide')) .dust().liquid(new FluidBuilder().temperature(723)) .color(0xdfcfc2) - .components(Boron, 2, Oxygen, 3) + .components(Boron * 2, Oxygen * 3) .build() ZincChloride = new Material.Builder(8127, SuSyUtility.susyId('zinc_chloride')) .dust().liquid(new FluidBuilder().temperature(563)) - .components(Zinc, 1, Chlorine, 2) + .components(Zinc, Chlorine * 2) .colorAverage() .build() SodiumTetraborate = new Material.Builder(8128, SuSyUtility.susyId('sodium_tetraborate')) .dust() - .components(Sodium, 2, Boron, 4, Oxygen, 7) + .components(Sodium * 2, Boron * 4, Oxygen * 7) .color(0xdbe7db) .build() ElectrolyticBoron = new Material.Builder(8129, SuSyUtility.susyId('electrolytic_boron')) .dust() - .components(Boron, 1) + .components(Boron) .color(0x9bd4af) .build() CalciumSulfate = new Material.Builder(8130, SuSyUtility.susyId('calcium_sulfate')) .dust() - .components(Calcium, 1, Sulfur, 1, Oxygen, 4) + .components(Calcium, Sulfur, Oxygen * 4) .colorAverage() .build(); IronIISulfide = new Material.Builder(8131, SuSyUtility.susyId('iron_ii_sulfide')) .dust() - .components(Iron, 1, Sulfur, 1) + .components(Iron, Sulfur) .colorAverage() .build(); PotassiumSulfate = new Material.Builder(8132, SuSyUtility.susyId('potassium_sulfate')) .dust() - .components(Potassium, 2, Sulfur, 1, Oxygen, 4) + .components(Potassium * 2, Sulfur, Oxygen * 4) .colorAverage() .build(); WetAntimonyTrifluoride = new Material.Builder(8133, SuSyUtility.susyId('wet_antimony_trifluoride')) .dust() - .components(Antimony, 1, Fluorine, 3) + .components(Antimony, Fluorine * 3) .colorAverage() .build(); CalciumSulfide = new Material.Builder(8134, SuSyUtility.susyId('calcium_sulfide')) .dust() - .components(Calcium, 1, Sulfur, 1) + .components(Calcium, Sulfur) .colorAverage() .build(); VanadiumPentoxide = new Material.Builder(8136, SuSyUtility.susyId('vanadium_pentoxide')) .dust() - .components(Vanadium, 2, Oxygen, 5) + .components(Vanadium * 2, Oxygen * 5) .colorAverage() .build(); PotassiumPersulfate = new Material.Builder(8137, SuSyUtility.susyId('potassium_persulfate')) .dust() - .components(Potassium, 2, Sulfur, 2, Oxygen, 8) + .components(Potassium * 2, Sulfur * 2, Oxygen * 8) .colorAverage() .build(); LithiumHydroxide = new Material.Builder(8138, SuSyUtility.susyId('lithium_hydroxide')) .dust() - .components(Lithium, 1, Oxygen, 1, Hydrogen, 1) + .components(Lithium, Oxygen, Hydrogen) .colorAverage() .build(); CalciumCarbide = new Material.Builder(8139, SuSyUtility.susyId('calcium_carbide')) .dust() - .components(Calcium, 1, Carbon, 2) + .components(Calcium, Carbon * 2) .color(0x87847c) .build(); IronIIChloride = new Material.Builder(8140, SuSyUtility.susyId('iron_ii_chloride')) .dust() - .components(Iron, 1, Chlorine, 2) + .components(Iron, Chlorine * 2) .color(0x9dad37) .build() CuprousOxide = new Material.Builder(8141, SuSyUtility.susyId('cuprous_oxide')) .dust() - .components(Copper, 2, Oxygen, 1) + .components(Copper * 2, Oxygen) .flags(GENERATE_CATALYST_BED) .color(0x822635) .build() LithiumBromide = new Material.Builder(8142, SuSyUtility.susyId('lithium_bromide')) .dust() - .components(Lithium, 1, Bromine, 1) + .components(Lithium, Bromine) .color(0xC5C5C5) .build() IronIIIOxide = new Material.Builder(8143, SuSyUtility.susyId('iron_iii_oxide')) .dust() - .components(Iron, 2, Oxygen, 3) + .components(Iron * 2, Oxygen * 3) .flags(GENERATE_CATALYST_BED) .color(0x8F0C03) .build() CopperIIChloride = new Material.Builder(8144, SuSyUtility.susyId('copper_ii_chloride')) .dust() - .components(Copper, 1, Chlorine, 2) + .components(Copper, Chlorine * 2) .flags(GENERATE_CATALYST_BED) .color(0x12112c) .build() @@ -402,63 +402,63 @@ public class FirstDegreeMaterials { SiliconCarbide = new Material.Builder(8145, SuSyUtility.susyId('silicon_carbide')) .dust() .flags(GENERATE_PLATE) - .components(Silicon, 1, Carbon, 1) + .components(Silicon, Carbon) .color(0x404040) .build() TungstenTrioxide = new Material.Builder(8146, SuSyUtility.susyId('tungsten_trioxide')) .dust() - .components(Tungsten, 1, Oxygen, 3) + .components(Tungsten, Oxygen * 3) .color(0x8a9734) .build() Alumina = new Material.Builder(8147, SuSyUtility.susyId('alumina')) .dust().liquid(new FluidBuilder().temperature(2345)) .flags(GENERATE_PLATE) - .components(Aluminium, 2, Oxygen, 3) + .components(Aluminium * 2, Oxygen * 3) .color(0xd0cff7) .build() BoronCarbide = new Material.Builder(8148, SuSyUtility.susyId('boron_carbide')) .dust() - .components(Boron, 4, Carbon, 1) + .components(Boron * 4, Carbon) .flags(GENERATE_ROD) .colorAverage() .build() SilverChloride = new Material.Builder(8149, SuSyUtility.susyId('silver_chloride')) .dust() - .components(Silver, 1, Chlorine, 1) + .components(Silver, Chlorine) .colorAverage() .build() ArsenicIIISulfide = new Material.Builder(8150, SuSyUtility.susyId('arsenic_iii_sulfide')) .dust() - .components(Arsenic, 2, Sulfur, 3) + .components(Arsenic * 2, Sulfur * 3) .colorAverage() .build() SodiumArsenide = new Material.Builder(8151, SuSyUtility.susyId('sodium_arsenide')) .dust() - .components(Sodium, 3, Arsenic, 1) + .components(Sodium * 3, Arsenic) .colorAverage() .build() ArsenicVSulfide = new Material.Builder(8152, SuSyUtility.susyId('arsenic_v_sulfide')) .dust() - .components(Arsenic, 2, Sulfur, 5) + .components(Arsenic * 2, Sulfur * 5) .colorAverage() .build() CopperSulfate = new Material.Builder(8153, SuSyUtility.susyId('copper_sulfate')) .dust() - .components(Copper, 1, Sulfur, 1, Oxygen, 4) + .components(Copper, Sulfur, Oxygen * 4) .colorAverage() .build() RoastedSperrylite = new Material.Builder(8154, SuSyUtility.susyId('roasted_sperrylite')) .dust() - .components(Platinum, 1) + .components(Platinum) .color(0x3b1754) .flags(DISABLE_DECOMPOSITION) .iconSet(SAND) @@ -466,7 +466,7 @@ public class FirstDegreeMaterials { EnargiteResidue = new Material.Builder(8155, SuSyUtility.susyId('enargite_residue')) .dust() - .components(Copper, 2, Sulfur, 1) + .components(Copper * 2, Sulfur) .color(0x59183c) .flags(DISABLE_DECOMPOSITION) .iconSet(BRIGHT) @@ -475,55 +475,55 @@ public class FirstDegreeMaterials { HydrogenChloride = new Material.Builder(8156, SuSyUtility.susyId('hydrogen_chloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Chlorine, 1) + .components(Hydrogen, Chlorine) .colorAverage() .build(); HydrogenFluoride = new Material.Builder(8157, SuSyUtility.susyId('hydrogen_fluoride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Fluorine, 1) + .components(Hydrogen, Fluorine) .colorAverage() .build(); DilutedSaltwater = new Material.Builder(8158, SuSyUtility.susyId('diluted_saltwater')) .liquid() - .components(Salt, 1, Water, 2) + .components(Salt, Water * 2) .color(0x3d61b8) .build(); SodiumHydroxideSolution = new Material.Builder(8159, SuSyUtility.susyId('sodium_hydroxide_solution')) .liquid() - .components(SodiumHydroxide, 1, Water, 1) + .components(SodiumHydroxide, Water) .colorAverage() .build(); IronIIIChlorideSolution = new Material.Builder(8160, SuSyUtility.susyId('iron_iii_chloride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Iron3Chloride, 1, Water, 1) + .components(Iron3Chloride, Water) .colorAverage() .build(); DilutedSaltpeterSolution = new Material.Builder(8161, SuSyUtility.susyId('diluted_saltpeter_solution')) .liquid() - .components(Saltpeter, 1, Water, 2) + .components(Saltpeter, Water * 2) .colorAverage() .build(); HydrogenBromide = new Material.Builder(8162, SuSyUtility.susyId('hydrogen_bromide')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Bromine, 1) + .components(Hydrogen, Bromine) .colorAverage() .build(); DilutedCalciumChlorideSolution = new Material.Builder(8163, SuSyUtility.susyId('diluted_calcium_chloride_solution')) .liquid() - .components(CalciumChloride, 1, Water, 2) + .components(CalciumChloride, Water * 2) .colorAverage() .build(); DilutedRockSaltSolution = new Material.Builder(8164, SuSyUtility.susyId('diluted_rock_salt_solution')) .liquid() - .components(RockSalt, 1, Water, 2) + .components(RockSalt, Water * 2) .colorAverage() .build(); @@ -531,25 +531,25 @@ public class FirstDegreeMaterials { AmmoniaSolution = new Material.Builder(8166, SuSyUtility.susyId('ammonia_solution')) .liquid() - .components(Ammonia, 1, Water, 1) + .components(Ammonia, Water) .colorAverage() .build(); SaltpeterSolution = new Material.Builder(8167, SuSyUtility.susyId('saltpeter_solution')) .liquid() - .components(Saltpeter, 1, Water, 1) + .components(Saltpeter, Water) .colorAverage() .build(); SaltySaltpeterSolution = new Material.Builder(8168, SuSyUtility.susyId('salty_saltpeter_solution')) .liquid() - .components(Saltpeter, 1, SaltWater, 1) + .components(Saltpeter, SaltWater) .colorAverage() .build(); CarbonDisulfide = new Material.Builder(8169, SuSyUtility.susyId('carbon_disulfide')) .liquid() - .components(Carbon, 1, Sulfur, 2) + .components(Carbon, Sulfur * 2) .colorAverage() .build(); @@ -557,73 +557,73 @@ public class FirstDegreeMaterials { Cryolite = new Material.Builder(8171, SuSyUtility.susyId('cryolite')) .dust().liquid(new FluidBuilder().temperature(1285)) - .components(Sodium, 3, Aluminium, 1, Fluorine, 6) + .components(Sodium * 3, Aluminium, Fluorine * 6) .color(0x2497a6) .build(); HeavyWater = new Material.Builder(8173, SuSyUtility.susyId('heavy_water')) .liquid() - .components(Deuterium, 2, Oxygen, 1) + .components(Deuterium * 2, Oxygen) .color(0x2c37b0) .build(); HeavyHydrogenSulfide = new Material.Builder(8174, SuSyUtility.susyId('heavy_hydrogen_sulfide')) .gas() - .components(Deuterium, 2, Sulfur, 1) + .components(Deuterium * 2, Sulfur) .color(0xb09a2c) .build(); SemiHeavyHydrogenSulfide = new Material.Builder(8175, SuSyUtility.susyId('semiheavy_hydrogen_sulfide')) .gas() - .components(Hydrogen, 1, Deuterium, 1, Sulfur, 1) + .components(Hydrogen, Deuterium, Sulfur) .color(0xc29836) .build(); SemiHeavyWater = new Material.Builder(8176, SuSyUtility.susyId('semiheavy_water')) .liquid() - .components(Hydrogen, 1, Deuterium, 1, Oxygen, 1) + .components(Hydrogen, Deuterium, Oxygen) .color(0x364ec2) .build(); ImpureSemiheavyWater = new Material.Builder(8177, SuSyUtility.susyId('impure_semiheavy_water')) .liquid() - .components(SemiHeavyWater, 1, Water, 1) + .components(SemiHeavyWater, Water) .colorAverage() .build(); IsotopicallyPureHydrogenSulfide = new Material.Builder(8178, SuSyUtility.susyId('isotopically_pure_hydrogen_sulfide')) .gas() - .components(HydrogenSulfide, 1) + .components(HydrogenSulfide) .color(0xffab66) .build(); ImpureSemiheavyHydrogenSulfide = new Material.Builder(8179, SuSyUtility.susyId('impure_semiheavy_hydrogen_sulfide')) .gas() - .components(HydrogenSulfide, 1, SemiHeavyHydrogenSulfide, 1) + .components(HydrogenSulfide, SemiHeavyHydrogenSulfide) .colorAverage() .build(); ImpureHeavyHydrogenSulfide = new Material.Builder(8180, SuSyUtility.susyId('impure_heavy_hydrogen_sulfide')) .gas() - .components(HydrogenSulfide, 1, HeavyHydrogenSulfide, 1) + .components(HydrogenSulfide, HeavyHydrogenSulfide) .colorAverage() .build(); TetrafluoroboricAcid = new Material.Builder(8182, SuSyUtility.susyId('tetrafluoroboric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Boron, 1, Fluorine, 4, Water, 3) + .components(Hydrogen, Boron, Fluorine * 4, Water * 3) .color(0xa4ab91) .build(); BoronTrichloride = new Material.Builder(8183, SuSyUtility.susyId('boron_trichloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)).plasma() - .components(Boron, 1, Chlorine, 3) + .components(Boron, Chlorine * 3) .colorAverage() .build(); ProustiteAlkalineLeachSolution = new Material.Builder(8184, SuSyUtility.susyId('proustite_alkaline_leach_solution')) .liquid() - .components(Sodium, 3, Arsenic, 1, Sulfur, 3, Water, 1) + .components(Sodium * 3, Arsenic, Sulfur * 3, Water) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -631,7 +631,7 @@ public class FirstDegreeMaterials { CrudeArsenicTrichloride = new Material.Builder(8185, SuSyUtility.susyId('crude_arsenic_trichloride')) .liquid() - .components(Arsenic, 1, Chlorine, 3) + .components(Arsenic, Chlorine * 3) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -639,13 +639,13 @@ public class FirstDegreeMaterials { Arsine = new Material.Builder(8186, SuSyUtility.susyId('arsine')) .gas() - .components(Arsenic, 1, Hydrogen, 3) + .components(Arsenic, Hydrogen * 3) .colorAverage() .build() EnargiteSulfideLeachSolution = new Material.Builder(8187, SuSyUtility.susyId('enargite_sulfide_leach_solution')) .liquid() - .components(Sodium, 3, Arsenic, 1, Sulfur, 4, Water, 1) + .components(Sodium * 3, Arsenic, Sulfur * 4, Water) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -653,7 +653,7 @@ public class FirstDegreeMaterials { CobaltiteLeachSolution = new Material.Builder(8188, SuSyUtility.susyId('cobaltite_leach_solution')) .liquid() - .components(Cobalt, 3, Nitrogen, 6, Oxygen, 30, Hydrogen, 9, Arsenic, 3, Water, 3) + .components(Cobalt * 3, Nitrogen * 6, Oxygen * 30, Hydrogen * 9, Arsenic * 3, Water * 3) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -661,7 +661,7 @@ public class FirstDegreeMaterials { ArsenopyriteLeachSolution = new Material.Builder(8189, SuSyUtility.susyId('arsenopyrite_leach_solution')) .liquid() - .components(Iron, 3, Nitrogen, 6, Oxygen, 32, Hydrogen, 13, Arsenic, 3, Water, 3) + .components(Iron * 3, Nitrogen * 6, Oxygen * 32, Hydrogen * 13, Arsenic * 3, Water * 3) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -671,7 +671,7 @@ public class FirstDegreeMaterials { ArsenicTrichloride = new Material.Builder(8191, SuSyUtility.susyId('arsenic_trichloride')) .liquid() - .components(Arsenic, 1, Chlorine, 3) + .components(Arsenic, Chlorine * 3) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -680,7 +680,7 @@ public class FirstDegreeMaterials { SperryliteWaste = new Material.Builder(8193, SuSyUtility.susyId('sperrylite_waste')) .liquid() - .components(Chlorine, 4, Cobalt, 1, Nickel, 1, Water, 2) + .components(Chlorine * 4, Cobalt, Nickel, Water * 2) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -688,7 +688,7 @@ public class FirstDegreeMaterials { AcidicCopperSolution = new Material.Builder(8194, SuSyUtility.susyId('acidic_copper_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Copper, 2, Sulfur, 2, Oxygen, 8, NitricAcid, 2, Water, 4) + .components(Copper * 2, Sulfur * 2, Oxygen * 8, NitricAcid * 2, Water * 4) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -696,45 +696,45 @@ public class FirstDegreeMaterials { WustiteCatalyst = new Material.Builder(8195, SuSyUtility.susyId('wustite_catalyst')) .dust() - .components(Iron, 1, Oxygen, 1) + .components(Iron, Oxygen) .color(0x696e62) .build() PalladiumChloride = new Material.Builder(8196, SuSyUtility.susyId('palladium_chloride')) .dust() .iconSet(SHINY) - .components(Palladium, 1, Chlorine, 2) + .components(Palladium, Chlorine * 2) .colorAverage() .build() HexachloroiridicAcid = new Material.Builder(8197, SuSyUtility.susyId('hexachloroiridic_acid')) .dust() .iconSet(SHINY) - .components(Chlorine, 6, Hydrogen, 2, Iridium, 1) + .components(Chlorine * 6, Hydrogen * 2, Iridium) .colorAverage() .build() PotassiumIodide = new Material.Builder(8198, SuSyUtility.susyId('potassium_iodide')) .dust() - .components(Potassium, 1, Iodine, 1) + .components(Potassium, Iodine) .colorAverage() .build() IridiumIodide = new Material.Builder(8199, SuSyUtility.susyId('iridium_iodide')) .dust() - .components(Iridium, 1, Iodine, 4) + .components(Iridium, Iodine * 4) .colorAverage() .build() PhosphorusTrichloride = new Material.Builder(8200, SuSyUtility.susyId('phosphorus_trichloride')) .liquid() - .components(Phosphorus, 1, Chlorine, 3) + .components(Phosphorus, Chlorine * 3) .colorAverage() .build() Diamminedichloropalladium = new Material.Builder(8201, SuSyUtility.susyId('diamminedichloropalladium')) .dust() - .components(Palladium, 1, Nitrogen, 2, Hydrogen, 6, Chlorine, 2) + .components(Palladium, Nitrogen * 2, Hydrogen * 6, Chlorine * 2) .color(0xd4d192) .build(); @@ -742,32 +742,32 @@ public class FirstDegreeMaterials { DecarburizedAir = new Material.Builder(8202, SuSyUtility.susyId('decarburized_air')) .gas() - .components(Nitrogen, 78, Oxygen, 21, Argon, 1) + .components(Nitrogen * 78, Oxygen * 21, Argon) .color(0x90bbe0) .build(); ZincOxide = new Material.Builder(8203, SuSyUtility.susyId("zinc_oxide")) .dust() - .components(Zinc, 1, Oxygen, 1) + .components(Zinc, Oxygen) .color(0xFFFFF5) .build(); HydrogenSilsesquioxane = new Material.Builder(8204, SuSyUtility.susyId('hydrogen_silsesquioxane')) .dust() .color(0xC7C0CB) - .components(Hydrogen, 8, Silicon, 8, Oxygen, 12) + .components(Hydrogen * 8, Silicon * 8, Oxygen * 12) .build() SodiumDichromate = new Material.Builder(8205, SuSyUtility.susyId('sodium_dichromate')) .dust() - .components(Sodium, 2, Chrome, 2, Oxygen, 7) + .components(Sodium * 2, Chrome * 2, Oxygen * 7) .colorAverage() .build() RaneyNickel = new Material.Builder(8206, SuSyUtility.susyId('raney_nickel')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(Nickel, 1, Aluminium, 1) + .components(Nickel, Aluminium) .color(0x858aa1) .build() @@ -775,7 +775,7 @@ public class FirstDegreeMaterials { .dust() .iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) - .components(Nickel, 1, Aluminium, 1) + .components(Nickel, Aluminium) .color(0xa9aec4) .build() @@ -783,39 +783,39 @@ public class FirstDegreeMaterials { DicobaltOctacarbonyl = new Material.Builder(8210, SuSyUtility.susyId('dicobalt_octacarbonyl')) .dust() - .components(Cobalt, 2, Cobalt, 8, Oxygen, 8) + .components(Cobalt * 2, Cobalt * 8, Oxygen * 8) .colorAverage() .build() .setFormula("Co2(CO)8", true) ImpregnatedAluminaCatalyst = new Material.Builder(8211, SuSyUtility.susyId('impregnated_alumina_catalyst')) .dust() - .components(SiliconDioxide, 1, Alumina, 1) + .components(SiliconDioxide, Alumina) .colorAverage() .build() BismuthCopper = new Material.Builder(8212, SuSyUtility.susyId('bismuth_copper')) .dust() - .components(Bismuth, 1, Copper, 1) + .components(Bismuth, Copper) .flags(GENERATE_CATALYST_BED) .colorAverage() .build() Bromobenzene = new Material.Builder(8213, SuSyUtility.susyId('bromobenzene')) .liquid() - .components(Carbon, 6, Hydrogen, 5, Bromine, 1) + .components(Carbon * 6, Hydrogen * 5, Bromine) .colorAverage() .build() ManganeseIISulfate = new Material.Builder(8214, SuSyUtility.susyId('manganese_ii_sulfate')) .dust() - .components(Manganese, 1, Sulfur, 1, Oxygen, 4) + .components(Manganese, Sulfur, Oxygen * 4) .colorAverage() .build(); Triethylaluminium = new Material.Builder(8215, SuSyUtility.susyId('triethylaluminium')) .liquid() - .components(Carbon, 12, Hydrogen, 30, Aluminium, 2) + .components(Carbon * 12, Hydrogen * 30, Aluminium * 2) .colorAverage() .build() @@ -823,25 +823,25 @@ public class FirstDegreeMaterials { HydrogenPeroxide = new Material.Builder(8216, SuSyUtility.susyId('hydrogen_peroxide')) .liquid() - .components(Hydrogen, 2, Oxygen, 2) + .components(Hydrogen * 2, Oxygen * 2) .colorAverage() .build() CarbonTetrabromide = new Material.Builder(8217, SuSyUtility.susyId('carbon_tetrabromide')) .dust() - .components(Carbon, 1, Bromine, 4) + .components(Carbon, Bromine * 4) .colorAverage() .build() Bromomethane = new Material.Builder(8218, SuSyUtility.susyId('bromomethane')) .gas() - .components(Carbon, 1, Hydrogen, 3, Bromine, 1) + .components(Carbon, Hydrogen * 3, Bromine) .colorAverage() .build() VeryDilutedSulfuricAcid = new Material.Builder(8219, SuSyUtility.susyId('very_diluted_sulfuric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 1, Water, 2) + .components(SulfuricAcid, Water * 2) .color(0x54362c) .build() @@ -849,122 +849,122 @@ public class FirstDegreeMaterials { ThionylChloride = new Material.Builder(8221, SuSyUtility.susyId('thionyl_chloride')) .liquid() - .components(Sulfur, 1, Oxygen, 1, Chlorine, 2) + .components(Sulfur, Oxygen, Chlorine * 2) .colorAverage() .build() LithiumHydride = new Material.Builder(8222, SuSyUtility.susyId('lithium_hydride')) .dust() - .components(Lithium, 1, Hydrogen, 1) + .components(Lithium, Hydrogen) .colorAverage() .build() BoronTrifluoride = new Material.Builder(8223, SuSyUtility.susyId('boron_trifluoride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Boron, 1, Fluorine, 3) + .components(Boron, Fluorine * 3) .colorAverage() .build() Diborane = new Material.Builder(8224, SuSyUtility.susyId('diborane')) .gas() - .components(Boron, 2, Hydrogen, 6) + .components(Boron * 2, Hydrogen * 6) .color(0x524545) .build() LithiumFluoride = new Material.Builder(8225, SuSyUtility.susyId('lithium_fluoride')) .dust() - .components(Lithium, 1, Fluorine, 1) + .components(Lithium, Fluorine) .colorAverage() .build() LithiumTetrafluoroborate = new Material.Builder(8226, SuSyUtility.susyId('lithium_tetrafluoroborate')) .dust() - .components(Lithium, 1, Boron, 1, Fluorine, 4) + .components(Lithium, Boron, Fluorine * 4) .colorAverage() .build() TetramethylammoniumChloride = new Material.Builder(8227, SuSyUtility.susyId('tetramethylammonium_chloride')) .dust() - .components(Carbon, 4, Hydrogen, 12, Nitrogen, 1, Chlorine, 1) + .components(Carbon * 4, Hydrogen * 12, Nitrogen, Chlorine) .colorAverage() .build() TetramethylammoniumHydroxide = new Material.Builder(8228, SuSyUtility.susyId('tetramethylammonium_hydroxide')) .dust() - .components(Carbon, 4, Hydrogen, 13, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 13, Nitrogen, Oxygen) .colorAverage() .build() MethacrylamideSulfate = new Material.Builder(8229, SuSyUtility.susyId('methacrylamide_sulfate')) .dust() - .components(Carbon, 4, Hydrogen, 9, Nitrogen, 1, Oxygen, 5, Sulfur, 1) + .components(Carbon * 4, Hydrogen * 9, Nitrogen, Oxygen * 5, Sulfur) .colorAverage() .build() AmmoniumBisulfate = new Material.Builder(8230, SuSyUtility.susyId('ammonium_bisulfate')) .dust().liquid(new FluidBuilder().temperature(563)) - .components(Nitrogen, 1, Hydrogen, 5, Sulfur, 1, Oxygen, 4) + .components(Nitrogen, Hydrogen * 5, Sulfur, Oxygen * 4) .colorAverage() .build() .setFormula("(NH4)HSO4", true) Phosphine = new Material.Builder(8231, SuSyUtility.susyId('phosphine')) .gas() - .components(Phosphorus, 1, Hydrogen, 3) + .components(Phosphorus, Hydrogen * 3) .colorAverage() .build() PotassiumHypophosphite = new Material.Builder(8232, SuSyUtility.susyId('potassium_hypophosphite')) .dust() - .components(Potassium, 1, Phosphorus, 1, Oxygen, 2, Hydrogen, 2) + .components(Potassium, Phosphorus, Oxygen * 2, Hydrogen * 2) .colorAverage() .build() SodiumHypophosphite = new Material.Builder(8233, SuSyUtility.susyId('sodium_hypophosphite')) .dust() - .components(Sodium, 1, Phosphorus, 1, Oxygen, 2, Hydrogen, 2) + .components(Sodium, Phosphorus, Oxygen * 2, Hydrogen * 2) .colorAverage() .build() DipotassiumPhosphate = new Material.Builder(8234, SuSyUtility.susyId('dipotassium_phosphate')) .dust() - .components(Potassium, 2, Hydrogen, 1, Phosphorus, 1, Oxygen, 4) + .components(Potassium * 2, Hydrogen, Phosphorus, Oxygen * 4) .colorAverage() .build() DisodiumPhosphate = new Material.Builder(8235, SuSyUtility.susyId('disodium_phosphate')) .dust() - .components(Sodium, 2, Hydrogen, 1, Phosphorus, 1, Oxygen, 4) + .components(Sodium * 2, Hydrogen, Phosphorus, Oxygen * 4) .colorAverage() .build() SodiumCyanide = new Material.Builder(8236, SuSyUtility.susyId('sodium_cyanide')) .dust() - .components(Sodium, 1, Carbon, 1, Nitrogen, 1) + .components(Sodium, Carbon, Nitrogen) .colorAverage() .build() PhosphorylChloride = new Material.Builder(8237, SuSyUtility.susyId('phosphoryl_chloride')) .liquid() - .components(Phosphorus, 1, Oxygen, 1, Chlorine, 3) + .components(Phosphorus, Oxygen, Chlorine * 3) .colorAverage() .build() PhosphorusPentachloride = new Material.Builder(8238, SuSyUtility.susyId('phosphorus_pentachloride')) .dust() - .components(Phosphorus, 1, Chlorine, 5) + .components(Phosphorus, Chlorine * 5) .colorAverage() .build() AmmoniumIodide = new Material.Builder(8240, SuSyUtility.susyId('ammonium_iodide')) .dust().liquid(new FluidBuilder().temperature(824)) - .components(Nitrogen, 1, Hydrogen, 4, Iodine, 1) + .components(Nitrogen, Hydrogen * 4, Iodine) .colorAverage() .build() HydrobromicAcid = new Material.Builder(8241, SuSyUtility.susyId('hydrobromic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Bromine, 1, Water, 1) + .components(Hydrogen, Bromine, Water) .colorAverage() .build() @@ -973,32 +973,32 @@ public class FirstDegreeMaterials { AluminiumChloride = new Material.Builder(8242, SuSyUtility.susyId('aluminium_chloride')) .dust().gas(new FluidBuilder().temperature(453)) .flags(GENERATE_CATALYST_BED) - .components(Aluminium, 1, Chlorine, 3) + .components(Aluminium, Chlorine * 3) .colorAverage() .build() SodiumSulfite = new Material.Builder(8243, SuSyUtility.susyId('sodium_sulfite')) .dust() - .components(Sodium, 2, Sulfur, 1, Oxygen, 3) + .components(Sodium * 2, Sulfur, Oxygen * 3) .colorAverage() .build() SodiumThiosulfate = new Material.Builder(8244, SuSyUtility.susyId('sodium_thiosulfate')) .dust() - .components(Sodium, 2, Sulfur, 2, Oxygen, 3) + .components(Sodium * 2, Sulfur * 2, Oxygen * 3) .color(0x879e21) .build() SulfidicSilverCyanideSolution = new Material.Builder(8247, SuSyUtility.susyId('sulfidic_silver_cyanide_solution')) .liquid() - .components(Silver, 2, Carbon, 4, Nitrogen, 4, Sodium, 4, Sulfur, 1, Water, 4) + .components(Silver * 2, Carbon * 4, Nitrogen * 4, Sodium * 4, Sulfur, Water * 4) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() SilverCyanideSolution = new Material.Builder(8248, SuSyUtility.susyId('silver_cyanide_solution')) .liquid() - .components(Silver, 2, Carbon, 4, Nitrogen, 4, Sodium, 4, Chlorine, 2, Water, 4) + .components(Silver * 2, Carbon * 4, Nitrogen * 4, Sodium * 4, Chlorine * 2, Water * 4) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1006,7 +1006,7 @@ public class FirstDegreeMaterials { SulfidicPyrargyriteCyanideLeachSolution = new Material.Builder(8249, SuSyUtility.susyId('sulfidic_pyrargyrite_cyanide_leach_solution')) .liquid() - .components(Sodium, 6, Silver, 3, Carbon, 6, Nitrogen, 6, Antimony, 1, Sulfur, 3, Water, 6) + .components(Sodium * 6, Silver * 3, Carbon * 6, Nitrogen * 6, Antimony, Sulfur * 3, Water * 6) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1014,7 +1014,7 @@ public class FirstDegreeMaterials { PyrargyriteCyanideLeachSolution = new Material.Builder(8250, SuSyUtility.susyId('pyrargyrite_cyanide_leach_solution')) .liquid() - .components(Sodium, 6, Silver, 3, Carbon, 6, Nitrogen, 6, Chlorine, 3, Water, 12) + .components(Sodium * 6, Silver * 3, Carbon * 6, Nitrogen * 6, Chlorine * 3, Water * 12) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1022,7 +1022,7 @@ public class FirstDegreeMaterials { PyrargyriteThiosulfateLeachSolution = new Material.Builder(8251, SuSyUtility.susyId('pyrargyrite_thiosulfate_leach_solution')) .liquid() - .components(Sodium, 12, Silver, 3, Sulfur, 15, Oxygen, 18, Antimony, 1, Water, 5) + .components(Sodium * 12, Silver * 3, Sulfur * 15, Oxygen * 18, Antimony, Water * 5) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1030,21 +1030,21 @@ public class FirstDegreeMaterials { ThiosulfateThioantimoniteSolution = new Material.Builder(8252, SuSyUtility.susyId('thiosulfate_thioantimonite_solution')) .liquid() - .components(Sodium, 15, Sulfur, 15, Oxygen, 18, Antimony, 1, Water, 5) + .components(Sodium * 15, Sulfur * 15, Oxygen * 18, Antimony, Water * 5) .colorAverage() .build() .setFormula("(Na2S2O3)6(Na3SbS3)(H2O)5", true) ThiosulfateThioarseniteSolution = new Material.Builder(8253, SuSyUtility.susyId('thiosulfate_thioarsenite_solution')) .liquid() - .components(Sodium, 15, Sulfur, 15, Oxygen, 18, Arsenic, 1, Water, 5) + .components(Sodium * 15, Sulfur * 15, Oxygen * 18, Arsenic, Water * 5) .colorAverage() .build() .setFormula("(Na2S2O3)6(Na3AsS3)(H2O)5", true) SulfidicStephaniteCyanideLeachSolution = new Material.Builder(8254, SuSyUtility.susyId('sulfidic_stephanite_cyanide_leach_solution')) .liquid() - .components(Sodium, 10, Silver, 5, Carbon, 10, Nitrogen, 10, Antimony, 1, Sulfur, 4, Water, 12) + .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Antimony, Sulfur * 4, Water * 12) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1052,7 +1052,7 @@ public class FirstDegreeMaterials { StephaniteCyanideLeachSolution = new Material.Builder(8255, SuSyUtility.susyId('stephanite_cyanide_leach_solution')) .liquid() - .components(Sodium, 10, Silver, 5, Carbon, 10, Nitrogen, 10, Chlorine, 5, Water, 20) + .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Chlorine * 5, Water * 20) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1060,7 +1060,7 @@ public class FirstDegreeMaterials { ProustiteThiosulfateLeachSolution = new Material.Builder(8256, SuSyUtility.susyId('proustite_thiosulfate_leach_solution')) .liquid() - .components(Sodium, 12, Silver, 3, Sulfur, 15, Oxygen, 18, Arsenic, 1, Water, 5) + .components(Sodium * 12, Silver * 3, Sulfur * 15, Oxygen * 18, Arsenic, Water * 5) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1068,7 +1068,7 @@ public class FirstDegreeMaterials { AcidicArsenateVSolution = new Material.Builder(8257, SuSyUtility.susyId('acidic_arsenate_v_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 9, Arsenic, 3, Oxygen, 12, NitricAcid, 6) + .components(Hydrogen * 9, Arsenic * 3, Oxygen * 12, NitricAcid * 6) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() @@ -1076,43 +1076,43 @@ public class FirstDegreeMaterials { ArsenicVOxide = new Material.Builder(8258, SuSyUtility.susyId('arsenic_v_oxide')) .dust() - .components(Arsenic, 2, Oxygen, 5) + .components(Arsenic * 2, Oxygen * 5) .colorAverage() .build() SilverOxide = new Material.Builder(8259, SuSyUtility.susyId('silver_oxide')) .dust() - .components(Silver, 2, Oxygen, 1) + .components(Silver * 2, Oxygen) .colorAverage() .build() SilverSulfide = new Material.Builder(8260, SuSyUtility.susyId('silver_sulfide')) .dust() - .components(Silver, 2, Sulfur, 1) + .components(Silver * 2, Sulfur) .colorAverage() .build() IronThioantimonite = new Material.Builder(8261, SuSyUtility.susyId('iron_thioantimonite')) .dust() - .components(Iron, 1, Antimony, 1, Sulfur, 3) + .components(Iron, Antimony, Sulfur * 3) .colorAverage() .build() AntimonyIIISulfide = new Material.Builder(8262, SuSyUtility.susyId('antimony_iii_sulfide')) .dust() - .components(Antimony, 2, Sulfur, 3) + .components(Antimony * 2, Sulfur * 3) .colorAverage() .build() IronThioarsenite = new Material.Builder(8263, SuSyUtility.susyId('iron_thioarsenite')) .dust() - .components(Iron, 1, Arsenic, 1, Sulfur, 3) + .components(Iron, Arsenic, Sulfur * 3) .colorAverage() .build() ManganeseIIOxide = new Material.Builder(8265, SuSyUtility.susyId('manganese_ii_oxide')) .dust() - .components(Manganese, 1, Oxygen, 1) + .components(Manganese, Oxygen) .color(0x472400) .iconSet(SAND) .build() @@ -1120,7 +1120,7 @@ public class FirstDegreeMaterials { RaneyCobalt = new Material.Builder(8266, SuSyUtility.susyId('raney_cobalt')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(Cobalt, 1, Aluminium, 1) + .components(Cobalt, Aluminium) .color(0x1858a1) .build(); @@ -1128,13 +1128,13 @@ public class FirstDegreeMaterials { .dust() .iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) - .components(Cobalt, 1, Aluminium, 1) + .components(Cobalt, Aluminium) .color(0x3274bf) .build(); IronIIIHydroxide = new Material.Builder(8268, SuSyUtility.susyId('iron_iii_hydroxide')) .dust() - .components(Iron, 1, Oxygen, 3, Hydrogen, 3) + .components(Iron, Oxygen * 3, Hydrogen * 3) .color(0xcc7e35) .iconSet(SAND) .build() @@ -1142,47 +1142,47 @@ public class FirstDegreeMaterials { Cellulose = new Material.Builder(8269, SuSyUtility.susyId('cellulose')) .dust() - .components(Carbon, 6, Hydrogen, 10, Oxygen, 5) + .components(Carbon * 6, Hydrogen * 10, Oxygen * 5) .color(0x4a432f) .build() CrudeGalliumTrichloride = new Material.Builder(8270, SuSyUtility.susyId('crude_gallium_trichloride')) .dust().liquid(new FluidBuilder().temperature(351)) - .components(Gallium, 1, Chlorine, 3) + .components(Gallium, Chlorine * 3) .colorAverage() .build() .setFormula("(?)GaCl3", true) GalliumTrichloride = new Material.Builder(8271, SuSyUtility.susyId('gallium_trichloride')) .liquid(new FluidBuilder().temperature(351)) - .components(Gallium, 1, Chlorine, 3) + .components(Gallium, Chlorine * 3) .colorAverage() .build() .setFormula("GaCl3", true) MercuryIIChloride = new Material.Builder(8272, SuSyUtility.susyId('mercury_ii_chloride')) .dust() - .components(Mercury, 1, Chlorine, 2) + .components(Mercury, Chlorine * 2) .colorAverage() .build() BoronNitride = new Material.Builder(8273, SuSyUtility.susyId('boron_nitride')) .dust() .flags(GENERATE_PLATE) - .components(Boron, 1, Nitrogen, 1) + .components(Boron, Nitrogen) .colorAverage() .build() CrudeIronPentacarbonyl = new Material.Builder(8275, SuSyUtility.susyId('crude_iron_pentacarbonyl')) .liquid() - .components(Iron, 1, Carbon, 5, Oxygen, 5) + .components(Iron, Carbon * 5, Oxygen * 5) .color(0x362f2b) .build() .setFormula("Fe(CO)5", true) AluminiumSulfate = new Material.Builder(8276, SuSyUtility.susyId('aluminium_sulfate')) .dust() - .components(Aluminium, 2, Sulfur, 3, Oxygen, 12) + .components(Aluminium * 2, Sulfur * 3, Oxygen * 12) .colorAverage() .build() @@ -1190,56 +1190,56 @@ public class FirstDegreeMaterials { DemineralizedWater = new Material.Builder(8277, SuSyUtility.susyId('demineralized_water')) .liquid() - .components(Hydrogen, 2, Oxygen, 1) + .components(Hydrogen * 2, Oxygen) .color(0x4761a8) .build() DeaeratedWater = new Material.Builder(8278, SuSyUtility.susyId('deaerated_water')) .liquid() - .components(Hydrogen, 2, Oxygen, 1) + .components(Hydrogen * 2, Oxygen) .color(0x5681b3) .build() FilteredWater = new Material.Builder(8279, SuSyUtility.susyId('filtered_water')) .liquid() - .components(Hydrogen, 2, Oxygen, 1) + .components(Hydrogen * 2, Oxygen) .color(0x62a0bd) .build() SterilizedWater = new Material.Builder(8280, SuSyUtility.susyId('sterilized_water')) .liquid() - .components(Hydrogen, 2, Oxygen, 1) + .components(Hydrogen * 2, Oxygen) .color(0x6cb3c4) .build() UltrapureWater = new Material.Builder(8281, SuSyUtility.susyId('ultrapure_water')) .liquid() - .components(Hydrogen, 2, Oxygen, 1) + .components(Hydrogen * 2, Oxygen) .color(0x7acacf) .build() Ferrochromium = new Material.Builder(8282, SuSyUtility.susyId('ferrochromium')) .dust() - .components(Iron, 1, Chrome, 2) + .components(Iron, Chrome * 2) .color(0x6b6552) .build() Ferrosilicon = new Material.Builder(8283, SuSyUtility.susyId('ferrosilicon')) .dust() - .components(Iron, 1, Silicon, 3) + .components(Iron, Silicon * 3) .iconSet(SHINY) .color(0x999a99) .build() ConcentratedSaltWater = new Material.Builder(8284, SuSyUtility.susyId('concentrated_salt_water')) .liquid() - .components(Salt, 2, Water, 1) + .components(Salt * 2, Water) .colorAverage() .build(); HypersalineWater = new Material.Builder(8285, SuSyUtility.susyId('hypersaline_water')) .liquid() - .components(Salt, 4, Water, 1) + .components(Salt * 4, Water) .colorAverage() .build(); @@ -1247,31 +1247,31 @@ public class FirstDegreeMaterials { LithiumCobaltOxide = new Material.Builder(8287, SuSyUtility.susyId('lithium_cobalt_oxide')) .dust() - .components(Lithium, 1, Cobalt, 1, Oxygen, 2) + .components(Lithium, Cobalt, Oxygen * 2) .colorAverage() .build(); SodiumCathodeAlloy = new Material.Builder(8288, SuSyUtility.susyId('sodium_cathode_alloy')) .dust() - .components(Sodium, 4, Iron, 3, Manganese, 3, Oxygen, 12) + .components(Sodium * 4, Iron * 3, Manganese * 3, Oxygen * 12) .colorAverage() .build(); LithiumHexafluorophosphate = new Material.Builder(8289, SuSyUtility.susyId('lithium_hexafluorophosphate')) .dust() - .components(Lithium, 1, Phosphorus, 1, Fluorine, 6) + .components(Lithium, Phosphorus, Fluorine * 6) .colorAverage() .build(); NickelChloride = new Material.Builder(8290, SuSyUtility.susyId('nickel_chloride')) .dust() - .components(Nickel, 1, Chlorine, 2) + .components(Nickel, Chlorine * 2) .colorAverage() .build(); NickelHydroxide = new Material.Builder(8291, SuSyUtility.susyId('nickel_hydroxide')) .dust() - .components(Nickel, 1, Oxygen, 2, Hydrogen, 2) + .components(Nickel, Oxygen * 2, Hydrogen * 2) .colorAverage() .build(); @@ -1279,7 +1279,7 @@ public class FirstDegreeMaterials { NickelOxideHydroxide = new Material.Builder(8292, SuSyUtility.susyId('nickel_oxide_hydroxide')) .dust() - .components(Nickel, 1, Oxygen, 3, Hydrogen, 2) + .components(Nickel, Oxygen * 3, Hydrogen * 2) .colorAverage() .build(); @@ -1287,7 +1287,7 @@ public class FirstDegreeMaterials { SilverNitrateSolution = new Material.Builder(8293, SuSyUtility.susyId('silver_nitrate_solution')) .liquid() - .components(Silver, 1, Nitrogen, 1, Oxygen, 3, Water, 1) + .components(Silver, Nitrogen, Oxygen * 3, Water) .colorAverage() .build(); @@ -1295,7 +1295,7 @@ public class FirstDegreeMaterials { ChloroauricAcid = new Material.Builder(8294, SuSyUtility.susyId('chloroauric_acid')) .dust() - .components(Hydrogen, 1, Gold, 1, Chlorine, 4) + .components(Hydrogen, Gold, Chlorine * 4) .color(0xcc8821) .build(); @@ -1303,7 +1303,7 @@ public class FirstDegreeMaterials { SpentMoebiusElectrolyte = new Material.Builder(8295, SuSyUtility.susyId('spent_moebius_electrolyte')) .liquid() - .components(Silver, 1, Nitrogen, 1, Oxygen, 3, Water, 1) + .components(Silver, Nitrogen, Oxygen * 3, Water) .colorAverage() .build(); @@ -1311,13 +1311,13 @@ public class FirstDegreeMaterials { ActivatedCarbon = new Material.Builder(8296, SuSyUtility.susyId('activated_carbon')) .dust() - .components(Carbon, 1) + .components(Carbon) .color(0x38393b) .build(); SulfuricPGMSolution = new Material.Builder(8297, SuSyUtility.susyId('sulfuric_pgm_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 3, HydrochloricAcid, 12, Water, 8) + .components(SulfuricAcid * 3, HydrochloricAcid * 12, Water * 8) .colorAverage() .build(); @@ -1325,7 +1325,7 @@ public class FirstDegreeMaterials { PGMSolution = new Material.Builder(8298, SuSyUtility.susyId('pgm_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(HydrochloricAcid, 12, Water, 12) + .components(HydrochloricAcid * 12, Water * 12) .colorAverage() .build(); @@ -1333,21 +1333,21 @@ public class FirstDegreeMaterials { GoldPlatedSteel = new Material.Builder(8299, SuSyUtility.susyId('gold_plated_steel')) .ingot() - .components(Gold, 1, Steel, 1) + .components(Gold, Steel) .color(0xb8a639) .flags(GENERATE_FINE_WIRE) .build(); GoldConcentrate = new Material.Builder(8300, SuSyUtility.susyId('gold_concentrate')) .dust() - .components(SiliconDioxide, 4, Gold, 1) + .components(SiliconDioxide * 4, Gold) .colorAverage() .iconSet(SAND) .build(); LoadedCarbon = new Material.Builder(8301, SuSyUtility.susyId('loaded_carbon')) .dust() - .components(Sodium, 1, Gold, 1, Carbon, 3, Nitrogen, 2) + .components(Sodium, Gold, Carbon * 3, Nitrogen * 2) .color(0x44453b) .build(); @@ -1355,31 +1355,31 @@ public class FirstDegreeMaterials { SpentActivatedCarbon = new Material.Builder(8302, SuSyUtility.susyId('spent_activated_carbon')) .dust() - .components(Carbon, 1) + .components(Carbon) .color(0x262729) .build(); WashedActivatedCarbon = new Material.Builder(8303, SuSyUtility.susyId('washed_activated_carbon')) .dust() - .components(Carbon, 1) + .components(Carbon) .color(0x2d302b) .build(); CalciumOrthosilicate = new Material.Builder(8304, SuSyUtility.susyId('calcium_orthosilicate')) .dust() - .components(Calcium, 2, Silicon, 1, Oxygen, 4) + .components(Calcium * 2, Silicon, Oxygen * 4) .colorAverage() .build(); MagnesiumChlorideSolution = new Material.Builder(8305, SuSyUtility.susyId('magnesium_chloride_solution')) .liquid() - .components(MagnesiumChloride, 1, Water, 2) + .components(MagnesiumChloride, Water * 2) .colorAverage() .build(); MagnesiumHydroxide = new Material.Builder(8306, SuSyUtility.susyId('magnesium_hydroxide')) .dust() - .components(Magnesium, 1, Oxygen, 2, Hydrogen, 2) + .components(Magnesium, Oxygen * 2, Hydrogen * 2) .colorAverage() .build(); @@ -1387,32 +1387,32 @@ public class FirstDegreeMaterials { MagnesiumSulfate = new Material.Builder(8307, SuSyUtility.susyId('magnesium_sulfate')) .dust() - .components(Magnesium, 1, Sulfur, 1, Oxygen, 4) + .components(Magnesium, Sulfur, Oxygen * 4) .colorAverage() .build(); CeriumIVOxide = new Material.Builder(8308, SuSyUtility.susyId('cerium_iv_oxide')) .dust() - .components(Cerium, 1, Oxygen, 2) + .components(Cerium, Oxygen * 2) .colorAverage() .build(); CeriumIIIOxide = new Material.Builder(8309, SuSyUtility.susyId('cerium_iii_oxide')) .dust() - .components(Cerium, 2, Oxygen, 3) + .components(Cerium * 2, Oxygen * 3) .colorAverage() .build(); IronSulfate = new Material.Builder(8310, SuSyUtility.susyId('iron_sulfate')) .dust() - .components(Iron, 1, Sulfur, 1, Oxygen, 4) + .components(Iron, Sulfur, Oxygen * 4) .colorAverage() .build(); RoastedPetalite = new Material.Builder(8311, SuSyUtility.susyId('roasted_petalite')) .dust() .color(0xabc9c9) - .components(Lithium, 1, Aluminium, 1, Silicon, 4, Oxygen, 10) + .components(Lithium, Aluminium, Silicon * 4, Oxygen * 10) .iconSet(SAND) .build() .setFormula("(LiAlSi2O6)(SiO2)2", true) @@ -1420,42 +1420,42 @@ public class FirstDegreeMaterials { BetaSpodumene = new Material.Builder(8312, SuSyUtility.susyId('beta_spodumene')) .dust() .color(0xab7676) - .components(Lithium, 1, Aluminium, 1, Silicon, 2, Oxygen, 6) + .components(Lithium, Aluminium, Silicon * 2, Oxygen * 6) .build(); LithiumSulfate = new Material.Builder(8313, SuSyUtility.susyId('lithium_sulfate')) .dust() - .components(Lithium, 2, Sulfur, 1, Oxygen, 4) + .components(Lithium * 2, Sulfur, Oxygen * 4) .colorAverage() .build(); AluminiumPhosphate = new Material.Builder(8314, SuSyUtility.susyId('aluminium_phosphate')) .dust() - .components(Aluminium, 1, Phosphorus, 1, Oxygen, 4) + .components(Aluminium, Phosphorus, Oxygen * 4) .colorAverage() .build(); SiliconTetrafluoride = new Material.Builder(8315, SuSyUtility.susyId('silicon_tetrafluoride')) .gas() - .components(Silicon, 1, Fluorine, 4) + .components(Silicon, Fluorine * 4) .colorAverage() .build(); SodiumFluoroberyllate = new Material.Builder(8316, SuSyUtility.susyId('sodium_fluoroberyllate')) .dust() - .components(Sodium, 2, Beryllium, 1, Fluorine, 4) + .components(Sodium * 2, Beryllium, Fluorine * 4) .colorAverage() .build(); SodiumFluorosilicate = new Material.Builder(8317, SuSyUtility.susyId('sodium_fluorosilicate')) .dust() - .components(Sodium, 2, Silicon, 1, Fluorine, 6) + .components(Sodium * 2, Silicon, Fluorine * 6) .colorAverage() .build(); BerylliumHydroxide = new Material.Builder(8318, SuSyUtility.susyId('beryllium_hydroxide')) .dust() - .components(Beryllium, 1, Oxygen, 2, Hydrogen, 2) + .components(Beryllium, Oxygen * 2, Hydrogen * 2) .colorAverage() .build() .setFormula("Be(OH)2", true); @@ -1463,25 +1463,25 @@ public class FirstDegreeMaterials { BerylliumOxide = new Material.Builder(8319, SuSyUtility.susyId('beryllium_oxide')) .dust().liquid(new FluidBuilder().temperature(2851)) .flags(GENERATE_PLATE) - .components(Beryllium, 1, Oxygen, 1) + .components(Beryllium, Oxygen) .colorAverage() .build(); BerylliumChloride = new Material.Builder(8320, SuSyUtility.susyId('beryllium_chloride')) .dust().liquid(new FluidBuilder().temperature(672)) - .components(Beryllium, 1, Chlorine, 2) + .components(Beryllium, Chlorine * 2) .colorAverage() .build(); AmmoniumFluoride = new Material.Builder(8321, SuSyUtility.susyId('ammonium_fluoride')) .dust() - .components(Nitrogen, 1, Hydrogen, 4, Fluorine, 1) + .components(Nitrogen, Hydrogen * 4, Fluorine) .colorAverage() .build(); AmmoniumBifluoride = new Material.Builder(8322, SuSyUtility.susyId('ammonium_bifluoride')) .dust() - .components(Nitrogen, 1, Hydrogen, 5, Fluorine, 2) + .components(Nitrogen, Hydrogen * 5, Fluorine * 2) .colorAverage() .build(); @@ -1489,7 +1489,7 @@ public class FirstDegreeMaterials { AmmoniumFluoroberyllate = new Material.Builder(8323, SuSyUtility.susyId('ammonium_fluoroberyllate')) .dust() - .components(Nitrogen, 2, Hydrogen, 8, Beryllium, 1, Fluorine, 4) + .components(Nitrogen * 2, Hydrogen * 8, Beryllium, Fluorine * 4) .colorAverage() .build(); @@ -1497,7 +1497,7 @@ public class FirstDegreeMaterials { ChromiumIIIHydroxide = new Material.Builder(8324, SuSyUtility.susyId('chromium_iii_hydroxide')) .dust() - .components(Chrome, 1, Oxygen, 3, Hydrogen, 3) + .components(Chrome, Oxygen * 3, Hydrogen * 3) .color(0x2e5207) .build(); @@ -1506,31 +1506,31 @@ public class FirstDegreeMaterials { DisassociatedAmmoniumFluoride = new Material.Builder(8325, SuSyUtility.susyId('disassociated_ammonium_fluoride')) .gas(new FluidBuilder().temperature(1200)) - .components(Ammonia, 1, HydrogenFluoride, 1) + .components(Ammonia, HydrogenFluoride) .colorAverage() .build(); BerylliumFluoride = new Material.Builder(8326, SuSyUtility.susyId('beryllium_fluoride')) .dust() - .components(Beryllium, 1, Fluorine, 2) + .components(Beryllium, Fluorine * 2) .colorAverage() .build(); MagnesiumFluoride = new Material.Builder(8327, SuSyUtility.susyId('magnesium_fluoride')) .dust() - .components(Magnesium, 1, Fluorine, 2) + .components(Magnesium, Fluorine * 2) .colorAverage() .build(); DissolvedMagnesiumFluoride = new Material.Builder(8328, SuSyUtility.susyId('dissolved_magnesium_fluoride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Magnesium, 1, Chlorine, 2, HydrofluoricAcid, 2) + .components(Magnesium, Chlorine * 2, HydrofluoricAcid * 2) .colorAverage() .build(); DissolvedAlkaliBeryl = new Material.Builder(8329, SuSyUtility.susyId('dissolved_beryl')) .liquid() - .components(Beryllium, 3, Aluminium, 2, Sodium, 2, Sulfur, 7, Oxygen, 28, Water, 7) + .components(Beryllium * 3, Aluminium * 2, Sodium * 2, Sulfur * 7, Oxygen * 28, Water * 7) .colorAverage() .build(); @@ -1538,7 +1538,7 @@ public class FirstDegreeMaterials { PotassiumAlum = new Material.Builder(8330, SuSyUtility.susyId('potassium_alum')) .dust() - .components(Potassium, 1, Aluminium, 1, Sulfur, 2, Oxygen, 8) + .components(Potassium, Aluminium, Sulfur * 2, Oxygen * 8) .colorAverage() .build(); @@ -1546,7 +1546,7 @@ public class FirstDegreeMaterials { BerylliumSulfateSolution = new Material.Builder(8331, SuSyUtility.susyId('beryllium_sulfate_solution')) .liquid() - .components(Beryllium, 3, Sodium, 2, Sulfur, 4, Oxygen, 16, Water, 8) + .components(Beryllium * 3, Sodium * 2, Sulfur * 4, Oxygen * 16, Water * 8) .colorAverage() .build(); @@ -1554,82 +1554,82 @@ public class FirstDegreeMaterials { RutheniumIVOxide = new Material.Builder(8333, SuSyUtility.susyId('ruthenium_iv_oxide')) .dust() - .components(Ruthenium, 1, Oxygen, 2) + .components(Ruthenium, Oxygen * 2) .colorAverage() .build(); Trichlorosilane = new Material.Builder(8334, SuSyUtility.susyId('trichlorosilane')) .liquid() - .components(Hydrogen, 1, Chlorine, 3, Silicon, 1) + .components(Hydrogen, Chlorine * 3, Silicon) .color(0x77979e) .build(); PurifiedTrichlorosilane = new Material.Builder(8335, SuSyUtility.susyId('purified_trichlorosilane')) .liquid() - .components(Hydrogen, 1, Chlorine, 3, Silicon, 1) + .components(Hydrogen, Chlorine * 3, Silicon) .color(0x93b9c2) .build(); HexafluorosilicicAcid = new Material.Builder(8336, SuSyUtility.susyId('hexafluorosilicic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Silicon, 1, Fluorine, 6) + .components(Hydrogen * 2, Silicon, Fluorine * 6) .colorAverage() .build(); CrudeLead = new Material.Builder(8337, SuSyUtility.susyId('crude_lead')) .ingot().liquid(new FluidBuilder().temperature(600)) - .components(Lead, 1) + .components(Lead) .color(0x1f1926) .flags(GENERATE_PLATE, DISABLE_DECOMPOSITION) .build(); SilverFreeLead = new Material.Builder(8338, SuSyUtility.susyId('silver_free_lead')) .dust().liquid(new FluidBuilder().temperature(600)) - .components(Lead, 1) + .components(Lead) .color(0x26202e) .flags(DISABLE_DECOMPOSITION) .build(); BismuthDross = new Material.Builder(8339, SuSyUtility.susyId('bismuth_dross')) .dust().liquid(new FluidBuilder().temperature(600)) - .components(Calcium, 1, Magnesium, 2, Bismuth, 2) + .components(Calcium, Magnesium * 2, Bismuth * 2) .color(0x292b45) .build(); AntimonyDross = new Material.Builder(8340, SuSyUtility.susyId('antimony_dross')) .dust().liquid(new FluidBuilder().temperature(600)) - .components(Calcium, 1, Magnesium, 2, Antimony, 2) + .components(Calcium, Magnesium * 2, Antimony * 2) .color(0x3c3a45) .build(); ZincDross = new Material.Builder(8341, SuSyUtility.susyId('zinc_dross')) .dust().liquid(new FluidBuilder().temperature(600)) - .components(Zinc, 2, Silver, 1) + .components(Zinc * 2, Silver) .color(0xb7baa8) .build(); PurifiedTinIIOxide = new Material.Builder(8342, SuSyUtility.susyId('purified_tin_ii_oxide')) .dust() .iconSet(SHINY) - .components(Tin, 1, Oxygen, 1) + .components(Tin, Oxygen) .colorAverage() .build(); AluminiumSilicate = new Material.Builder(8343, SuSyUtility.susyId('aluminium_silicate')) .dust() - .components(Aluminium, 2, Silicon, 1, Oxygen, 5) + .components(Aluminium * 2, Silicon, Oxygen * 5) .colorAverage() .build(); ChromiumIIIOxide = new Material.Builder(8344, SuSyUtility.susyId('chromium_iii_oxide')) .dust() - .components(Chrome, 2, Oxygen, 3) + .components(Chrome * 2, Oxygen * 3) .color(0xb3c99) .build(); SodiumSulfateAcetoneSolution = new Material.Builder(8345, SuSyUtility.susyId('sodium_sulfate_acetone_solution')) .liquid() - .components(Sodium, 12, Sulfur, 6, Oxygen, 24, Acetone, 1, Water, 9) + .components(Sodium * 12, Sulfur * 6, Oxygen * 24, Acetone, Water * 9) .color(0x2c733a) .build(); @@ -1638,27 +1638,27 @@ public class FirstDegreeMaterials { CopperDross = new Material.Builder(8347, SuSyUtility.susyId('copper_dross')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(Copper, 1, Sulfur, 1) + .components(Copper, Sulfur) .color(0x000000) .build(); DecopperedLead = new Material.Builder(8348, SuSyUtility.susyId('decoppered_lead')) .liquid(new FluidBuilder().temperature(600)) .flags(DISABLE_DECOMPOSITION) - .components(Lead, 1) + .components(Lead) .color(0x886b9c) .build(); DezincedLead = new Material.Builder(8349, SuSyUtility.susyId('dezinced_lead')) .liquid(new FluidBuilder().temperature(600)) .flags(DISABLE_DECOMPOSITION) - .components(Lead, 1) + .components(Lead) .color(0x825d9c) .build(); BettsCrudeLead = new Material.Builder(8350, SuSyUtility.susyId('betts_crude_lead')) .ingot().liquid(new FluidBuilder().temperature(600)) - .components(Bismuth, 3, Lead, 6, Copper, 1) + .components(Bismuth * 3, Lead * 6, Copper) .flags(DISABLE_DECOMPOSITION) .color(0x393673) .build(); @@ -1666,39 +1666,39 @@ public class FirstDegreeMaterials { DecopperedBettsLead = new Material.Builder(8351, SuSyUtility.susyId('decoppered_betts_lead')) .liquid(new FluidBuilder().temperature(600)) .flags(DISABLE_DECOMPOSITION) - .components(Bismuth, 3, Lead, 6) + .components(Bismuth * 3, Lead * 6) .color(0x2f2d63) .build(); SoftenedLead = new Material.Builder(8352, SuSyUtility.susyId('softened_lead')) .dust().liquid(new FluidBuilder().temperature(600)) .flags(DISABLE_DECOMPOSITION) - .components(Lead, 1) + .components(Lead) .color(0x9874b0) .build(); SodiumAntimonate = new Material.Builder(8353, SuSyUtility.susyId('sodium_antimonate')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(Sodium, 1, Antimony, 1, Oxygen, 3) + .components(Sodium, Antimony, Oxygen * 3) .colorAverage() .build(); SodiumArsenate = new Material.Builder(8354, SuSyUtility.susyId('sodium_arsenate')) .dust().liquid(new FluidBuilder().temperature(553)) - .components(Sodium, 3, Arsenic, 1, Oxygen, 4) + .components(Sodium * 3, Arsenic, Oxygen * 4) .colorAverage() .build(); SodiumStannate = new Material.Builder(8355, SuSyUtility.susyId('sodium_stannate')) .dust() - .components(Sodium, 2, Tin, 1, Oxygen, 3) + .components(Sodium * 2, Tin, Oxygen * 3) .colorAverage() .build(); SaltyArsenicAcid = new Material.Builder(8356, SuSyUtility.susyId('salty_arsenic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Salt, 3, Hydrogen, 3, Arsenic, 1, Oxygen, 4, Water, 3) + .components(Salt * 3, Hydrogen * 3, Arsenic, Oxygen * 4, Water * 3) .colorAverage() .build(); @@ -1706,19 +1706,19 @@ public class FirstDegreeMaterials { SaltyArsenicPentoxide = new Material.Builder(8357, SuSyUtility.susyId('salty_arsenic_pentoxide')) .dust() - .components(Salt, 6, Arsenic, 2, Oxygen, 5) + .components(Salt * 6, Arsenic * 2, Oxygen * 5) .colorAverage() .build(); TinIVOxide = new Material.Builder(8358, SuSyUtility.susyId('tin_iv_oxide')) .dust() - .components(Tin, 1, Oxygen, 2) + .components(Tin, Oxygen * 2) .colorAverage() .build(); AntimonyVOxide = new Material.Builder(8359, SuSyUtility.susyId('antimony_v_oxide')) .dust() - .components(Antimony, 2, Oxygen, 5) + .components(Antimony * 2, Oxygen * 5) .colorAverage() .build(); @@ -1726,21 +1726,21 @@ public class FirstDegreeMaterials { CrudeTin = new Material.Builder(8361, SuSyUtility.susyId('crude_tin')) .liquid(new FluidBuilder().temperature(600)) - .components(Tin, 1) + .components(Tin) .color(0xbfbfbf) .iconSet(DULL) .build(); LeachedCassiteriteConcentrate = new Material.Builder(8362, SuSyUtility.susyId('leached_cassiterite_concentrate')) .dust() - .components(Cassiterite, 1) + .components(Cassiterite) .colorAverage() .iconSet(DULL) .build(); AmmoniumTungstateSolution = new Material.Builder(8363, SuSyUtility.susyId('ammonium_tungstate_solution')) .liquid() - .components(Nitrogen, 2, Hydrogen, 8, Tungsten, 1, Oxygen, 8, Water, 2) + .components(Nitrogen * 2, Hydrogen * 8, Tungsten, Oxygen * 8, Water * 2) .colorAverage() .build(); @@ -1748,75 +1748,75 @@ public class FirstDegreeMaterials { CopperMonosulfide = new Material.Builder(8364, SuSyUtility.susyId('copper_monosulfide')) .dust() - .components(Copper, 1, Sulfur, 1) + .components(Copper, Sulfur) .color(0x1a1817) .build(); PotassiumSaltMixture = new Material.Builder(8365, SuSyUtility.susyId('potassium_salt_mixture')) .liquid() - .components(Potassium, 1, Salt, 1) + .components(Potassium, Salt) .colorAverage() .build(); PotassiumSulfide = new Material.Builder(8366, SuSyUtility.susyId('potassium_sulfide')) .dust() - .components(Potassium, 2, Sulfur, 1) + .components(Potassium * 2, Sulfur) .color(0xcbcfae) .build(); WashedMagnesiumChlorideAmmoniate = new Material.Builder(8367, SuSyUtility.susyId('washed_magnesium_chloride_ammoniate')) .dust() - .components(MagnesiumChloride, 1, Ammonia, 6) + .components(MagnesiumChloride, Ammonia * 6) .colorAverage() .iconSet(SHINY) .build(); SaturatedAmmoniacalMethanol = new Material.Builder(8368, SuSyUtility.susyId('saturated_ammoniacal_methanol')) .liquid() - .components(Methanol, 2, Ammonia, 1) + .components(Methanol * 2, Ammonia) .colorAverage() .build(); MagnesiumChlorideAmmoniate = new Material.Builder(8369, SuSyUtility.susyId('magnesium_chloride_ammoniate')) .dust() - .components(MagnesiumChloride, 1, Ammonia, 6) + .components(MagnesiumChloride, Ammonia * 6) .colorAverage() .build(); PurifiedMagnesiumChloride = new Material.Builder(8370, SuSyUtility.susyId('purified_magnesium_chloride')) .dust().liquid(new FluidBuilder().temperature(987)) - .components(MagnesiumChloride, 1) + .components(MagnesiumChloride) .color(0xd40d5c) .iconSet(SHINY) .build(); DecarburizedAir = new Material.Builder(8371, SuSyUtility.susyId('decarburized_air')) .gas() - .components(Nitrogen, 78, Oxygen, 21, Argon, 1) + .components(Nitrogen * 78, Oxygen * 21, Argon) .color(0x90bbe0) .build(); BariumChloride = new Material.Builder(8372, SuSyUtility.susyId('barium_chloride')) .dust() - .components(Barium, 1, Chlorine, 2) + .components(Barium, Chlorine * 2) .colorAverage() .build(); BariumOxide = new Material.Builder(8373, SuSyUtility.susyId('barium_oxide')) .dust() - .components(Barium, 1, Oxygen, 1) + .components(Barium, Oxygen) .colorAverage() .build(); BariumCarbonate = new Material.Builder(8374, SuSyUtility.susyId('barium_carbonate')) .dust() - .components(Barium, 1, Carbon, 1, Oxygen, 3) + .components(Barium, Carbon, Oxygen * 3) .colorAverage() .build(); IronPentacarbonyl = new Material.Builder(8375, SuSyUtility.susyId('iron_pentacarbonyl')) .liquid() - .components(Iron, 1, Carbon, 5, Oxygen, 5) + .components(Iron, Carbon * 5, Oxygen * 5) .color(0x8c180d) .build(); @@ -1825,121 +1825,121 @@ public class FirstDegreeMaterials { IronTwoThreeOxide = new Material.Builder(8376, SuSyUtility.susyId('iron_two_three_oxide')) .dust() .color(0x141313) - .components(Iron, 3, Oxygen, 4) + .components(Iron * 3, Oxygen * 4) .build() PurifiedIronTwoThreeOxide = new Material.Builder(8377, SuSyUtility.susyId('purified_iron_two_three_oxide')) .dust() .iconSet(SHINY) .color(0x141313) - .components(Iron, 3, Oxygen, 4) + .components(Iron * 3, Oxygen * 4) .build() PurifiedIronIIIOxide = new Material.Builder(8378, SuSyUtility.susyId('purified_iron_iii_oxide')) .dust() .iconSet(SHINY) .color(0x8F0C03) - .components(Iron, 2, Oxygen, 3) + .components(Iron * 2, Oxygen * 3) .build() NickelIIOxide = new Material.Builder(8379, SuSyUtility.susyId('nickel_ii_oxide')) .dust() .color(0x92a371) - .components(Nickel, 1, Oxygen, 1) + .components(Nickel, Oxygen) .build() CarbonTetrafluoride = new Material.Builder(8380, SuSyUtility.susyId('carbon_tetrafluoride')) .gas().plasma() - .components(Carbon, 1, Fluorine, 4) + .components(Carbon, Fluorine * 4) .colorAverage() .build() NitrogenTrifluoride = new Material.Builder(8381, SuSyUtility.susyId('nitrogen_trifluoride')) .gas().plasma() - .components(Nitrogen, 1, Fluorine, 3) + .components(Nitrogen, Fluorine * 3) .colorAverage() .build() CobaltFerrite = new Material.Builder(8382, SuSyUtility.susyId('cobalt_ferrite')) .ingot() .flags(GENERATE_ROD, GENERATE_RING) - .components(Cobalt, 1, Iron, 2, Oxygen, 4) + .components(Cobalt, Iron * 2, Oxygen * 4) .colorAverage() .build() StrontiumFerrite = new Material.Builder(8383, SuSyUtility.susyId('strontium_ferrite')) .ingot() .flags(GENERATE_ROD, GENERATE_RING) - .components(Strontium, 1, Iron, 12, Oxygen, 19) + .components(Strontium, Iron * 12, Oxygen * 19) .colorAverage() .build() BariumFerrite = new Material.Builder(8384, SuSyUtility.susyId('barium_ferrite')) .ingot() .flags(GENERATE_ROD, GENERATE_RING) - .components(Barium, 1, Iron, 12, Oxygen, 19) + .components(Barium, Iron * 12, Oxygen * 19) .colorAverage() .build() ManganeseZincFerrite = new Material.Builder(8385, SuSyUtility.susyId('manganese_zinc_ferrite')) .ingot() .flags(GENERATE_ROD, GENERATE_RING) - .components(Manganese, 1, Zinc, 1, Iron, 4, Oxygen, 8) + .components(Manganese, Zinc, Iron * 4, Oxygen * 8) .colorAverage() .build() StrontiumCarbonate = new Material.Builder(8386, SuSyUtility.susyId('strontium_carbonate')) .dust() - .components(Strontium, 1, Carbon, 1, Oxygen, 3) + .components(Strontium, Carbon, Oxygen * 3) .colorAverage() .build() LithiumOxide = new Material.Builder(8387, SuSyUtility.susyId('lithium_oxide')) .dust().liquid(new FluidBuilder().temperature(1711)) - .components(Lithium, 2, Oxygen, 1) + .components(Lithium * 2, Oxygen) .colorAverage() .build(); LeadOxide = new Material.Builder(8388, SuSyUtility.susyId('lead_oxide')) .dust().gas(new FluidBuilder().temperature(1750)) .flags(NO_UNIFICATION) - .components(Lead, 1, Oxygen, 1) + .components(Lead, Oxygen) .colorAverage() .build() TantalumNitride = new Material.Builder(8389, SuSyUtility.susyId('tantalum_nitride')) .dust() - .components(Tantalum, 1, Nitrogen, 1) + .components(Tantalum, Nitrogen) .colorAverage() .build() RutheniumIVOxide = new Material.Builder(8390, SuSyUtility.susyId('ruthenium_iv_oxide')) .dust() - .components(Ruthenium, 1, Oxygen, 2) + .components(Ruthenium, Oxygen * 2) .colorAverage() .build() BismuthIridate = new Material.Builder(8391, SuSyUtility.susyId('bismuth_iridate')) .dust() - .components(Bismuth, 2, Iridium, 2, Oxygen, 7) + .components(Bismuth * 2, Iridium * 2, Oxygen * 7) .colorAverage() .build() SodiumBismuthate = new Material.Builder(8392, SuSyUtility.susyId('sodium_bismuthate')) .dust() - .components(Sodium, 1, Bismuth, 1, Oxygen, 3) + .components(Sodium, Bismuth, Oxygen * 3) .colorAverage() .build() BismuthIIIOxide = new Material.Builder(8393, SuSyUtility.susyId('bismuth_iii_oxide')) .dust() - .components(Bismuth, 2, Oxygen, 3) + .components(Bismuth * 2, Oxygen * 3) .colorAverage() .build() ManganeseIINitrate = new Material.Builder(8394, SuSyUtility.susyId('manganese_ii_nitrate')) .dust() - .components(Manganese, 1, Nitrogen, 2, Oxygen, 6) + .components(Manganese, Nitrogen * 2, Oxygen * 6) .colorAverage() .build() .setFormula("Mn(NO3)2", true) @@ -1947,25 +1947,25 @@ public class FirstDegreeMaterials { ManganeseDioxide = new Material.Builder(8395, SuSyUtility.susyId('manganese_dioxide')) .dust() .iconSet('SHINY') - .components(Manganese, 1, Oxygen, 2) + .components(Manganese, Oxygen * 2) .colorAverage() .build() BariumTitanate = new Material.Builder(8396, SuSyUtility.susyId('barium_titanate')) .gem().iconSet(RUBY) - .components(Barium, 1, Titanium, 1, Oxygen, 3) + .components(Barium, Titanium, Oxygen * 3) .colorAverage() .build() HafniumTetrachloride = new Material.Builder(8397, SuSyUtility.susyId('hafnium_tetrachloride')) .dust().liquid(new FluidBuilder().temperature(705)) - .components(Hafnium, 1, Chlorine, 4) + .components(Hafnium, Chlorine * 4) .color(0xcae3cc) .build(); AmmoniumThiocyanate = new Material.Builder(8398, SuSyUtility.susyId('ammonium_thiocyanate')) .dust() - .components(Nitrogen, 2, Hydrogen, 4, Sulfur, 1, Carbon, 1) + .components(Nitrogen * 2, Hydrogen * 4, Sulfur, Carbon) .colorAverage() .build(); @@ -1974,14 +1974,14 @@ public class FirstDegreeMaterials { RawElectrum = new Material.Builder(8399, SuSyUtility.susyId('raw_electrum')) .ore().liquid(new FluidBuilder().temperature(1300)) .color(0xfcf403) - .components(Silver, 1, Gold, 1) + .components(Silver, Gold) .build(); NeodymiumAlloy = new Material.Builder(8400, SuSyUtility.susyId('neodymium_alloy')) .ingot() .color(0x2b2a2a).iconSet(METALLIC) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE) - .components(Neodymium, 2, Iron, 14, Boron, 1) + .components(Neodymium * 2, Iron * 14, Boron) .blastTemp(1297, GasTier.MID) .build(); @@ -1989,7 +1989,7 @@ public class FirstDegreeMaterials { .ingot() .color(0x2b2a2a).iconSet(SHINY) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE, NO_UNIFICATION) - .components(NeodymiumAlloy, 1) + .components(NeodymiumAlloy) .ingotSmeltInto(NeodymiumAlloy) .arcSmeltInto(NeodymiumAlloy) .macerateInto(NeodymiumAlloy) @@ -1999,7 +1999,7 @@ public class FirstDegreeMaterials { .ingot() .color(0x2b2a2a).iconSet(MAGNETIC) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE, NO_UNIFICATION, IS_MAGNETIC) - .components(NeodymiumAlloy, 1) + .components(NeodymiumAlloy) .ingotSmeltInto(NeodymiumAlloy) .arcSmeltInto(NeodymiumAlloy) .macerateInto(NeodymiumAlloy) @@ -2011,14 +2011,14 @@ public class FirstDegreeMaterials { .dust().ingot().liquid(new FluidBuilder().temperature(800)) .color(0xb3d683).iconSet(METALLIC) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE, NO_UNIFICATION) - .components(Samarium, 1, Cobalt, 5) + .components(Samarium, Cobalt * 5) .build(); TreatedSamariumAlloy = new Material.Builder(8404, SuSyUtility.susyId('treated_samarium_alloy')) .ingot() .color(0xb3d683).iconSet(SHINY) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE, NO_UNIFICATION) - .components(SamariumAlloy, 1) + .components(SamariumAlloy) .ingotSmeltInto(SamariumAlloy) .arcSmeltInto(SamariumAlloy) .macerateInto(SamariumAlloy) @@ -2028,7 +2028,7 @@ public class FirstDegreeMaterials { .ingot() .color(0xb3d683).iconSet(MAGNETIC) .flags(GENERATE_ROD, GENERATE_LONG_ROD, GENERATE_RING, GENERATE_PLATE, NO_UNIFICATION, IS_MAGNETIC) - .components(SamariumAlloy, 1) + .components(SamariumAlloy) .ingotSmeltInto(SamariumAlloy) .arcSmeltInto(SamariumAlloy) .macerateInto(SamariumAlloy) @@ -2040,25 +2040,25 @@ public class FirstDegreeMaterials { Dichlorosilane = new Material.Builder(8407, SuSyUtility.susyId('dichlorosilane')) .gas() - .components(Silicon, 1, Hydrogen, 2, Chlorine, 2) + .components(Silicon, Hydrogen * 2, Chlorine * 2) .color(0x90ab84) .build() Chlorosilane = new Material.Builder(8408, SuSyUtility.susyId('chlorosilane')) .liquid() - .components(Silicon, 1, Hydrogen, 3, Chlorine, 1) + .components(Silicon, Hydrogen * 3, Chlorine) .color(0xa0ba95) .build() Silane = new Material.Builder(8409, SuSyUtility.susyId('silane')) .gas() - .components(Silicon, 1, Hydrogen, 4) + .components(Silicon, Hydrogen * 4) .color(0xbbd1b2) .build() NickelCarbonyl = new Material.Builder(8410, SuSyUtility.susyId('nickel_carbonyl')) .gas(new FluidBuilder().temperature(400)) - .components(Nickel, 1, Carbon, 4, Oxygen, 4) + .components(Nickel, Carbon * 4, Oxygen * 4) .colorAverage() .build() @@ -2066,20 +2066,20 @@ public class FirstDegreeMaterials { ChloroaceticAnhydride = new Material.Builder(8411, SuSyUtility.susyId('chloroacetic_anhydride')) .dust() - .components(Carbon, 4, Hydrogen, 4, Oxygen, 3, Chlorine, 2) + .components(Carbon * 4, Hydrogen * 4, Oxygen * 3, Chlorine * 2) .colorAverage() .build() ZirconiumDioxide = new Material.Builder(8412, SuSyUtility.susyId('zirconium_dioxide')) .dust() - .components(Zirconium, 1, Oxygen, 2) + .components(Zirconium, Oxygen * 2) .colorAverage() .build() CopperIINitrate = new Material.Builder(8413, SuSyUtility.susyId('copper_ii_nitrate')) .dust() .iconSet(SHINY) - .components(Copper, 1, Nitrogen, 2, Oxygen, 6) + .components(Copper, Nitrogen * 2, Oxygen * 6) .color(0x292fe3) .build() @@ -2088,7 +2088,7 @@ public class FirstDegreeMaterials { NickelIINitrate = new Material.Builder(8414, SuSyUtility.susyId('nickel_ii_nitrate')) .dust() .iconSet(SHINY) - .components(Nickel, 1, Nitrogen, 2, Oxygen, 6) + .components(Nickel, Nitrogen * 2, Oxygen * 6) .color(0x236359) .build() @@ -2097,7 +2097,7 @@ public class FirstDegreeMaterials { ZincNitrate = new Material.Builder(8415, SuSyUtility.susyId('zinc_nitrate')) .dust() .iconSet(SHINY) - .components(Zinc, 1, Nitrogen, 2, Oxygen, 6) + .components(Zinc, Nitrogen * 2, Oxygen * 6) .color(0xdfe6cf) .build() @@ -2106,7 +2106,7 @@ public class FirstDegreeMaterials { MagnesiumNitrate = new Material.Builder(8416, SuSyUtility.susyId('magnesium_nitrate')) .dust() .iconSet(SHINY) - .components(Magnesium, 1, Nitrogen, 2, Oxygen, 6) + .components(Magnesium, Nitrogen * 2, Oxygen * 6) .color(0xe8d8e3) .build() @@ -2114,37 +2114,37 @@ public class FirstDegreeMaterials { YttriumOxide = new Material.Builder(8417, SuSyUtility.susyId('yttrium_oxide')) .dust() - .components(Yttrium, 2, Oxygen, 3) + .components(Yttrium * 2, Oxygen * 3) .colorAverage() .build() NeodymiumOxide = new Material.Builder(8418, SuSyUtility.susyId('neodymium_oxide')) .dust() - .components(Neodymium, 2, Oxygen, 3) + .components(Neodymium * 2, Oxygen * 3) .colorAverage() .build() Bromooctane = new Material.Builder(8419, SuSyUtility.susyId('bromooctane')) .liquid() - .components(Carbon, 8, Hydrogen, 17, Bromine, 1) + .components(Carbon * 8, Hydrogen * 17, Bromine) .colorAverage() .build() LithiumDioctylcopper = new Material.Builder(8420, SuSyUtility.susyId('lithium_dioctylcopper')) .liquid() - .components(Carbon, 16, Hydrogen, 34, Copper, 1, Lithium, 1) + .components(Carbon * 16, Hydrogen * 34, Copper, Lithium) .colorAverage() .build() DecanoylChloride = new Material.Builder(8421, SuSyUtility.susyId('decanoyl_chloride')) .liquid() - .components(Carbon, 10, Hydrogen, 19, Chlorine, 1, Oxygen, 1) + .components(Carbon * 10, Hydrogen * 19, Chlorine, Oxygen) .colorAverage() .build() SodiumCyanoborohydride = new Material.Builder(8422, SuSyUtility.susyId('sodium_cyanoborohydride')) .dust() - .components(Sodium, 1, Boron, 1, Hydrogen, 3, Carbon, 1, Nitrogen, 1) + .components(Sodium, Boron, Hydrogen * 3, Carbon, Nitrogen) .colorAverage() .build() @@ -2152,91 +2152,91 @@ public class FirstDegreeMaterials { DilutedSodiumHydroxideSolution = new Material.Builder(8423, SuSyUtility.susyId('diluted_sodium_hydroxide_solution')) .liquid() - .components(SodiumHydroxide, 1, Water, 2) + .components(SodiumHydroxide, Water * 2) .colorAverage() .build(); Oleum = new Material.Builder(8425, SuSyUtility.susyId('oleum')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 10, SulfurTrioxide, 1) + .components(SulfuricAcid * 10, SulfurTrioxide) .color(0xe8c3a5) .build(); ChromiumSulfateSolution = new Material.Builder(8426, SuSyUtility.susyId('chromium_sulfate_solution')) .liquid() - .components(Chrome, 4, Sulfur, 6, Oxygen, 24, Acetone, 1, Water, 9) + .components(Chrome * 4, Sulfur * 6, Oxygen * 24, Acetone, Water * 9) .color(0x2c733a) .build(); MustardGas = new Material.Builder(8427, SuSyUtility.susyId('mustard_gas')) .liquid() - .components(Carbon, 4, Hydrogen, 8, Chlorine, 2, Sulfur, 1) + .components(Carbon * 4, Hydrogen * 8, Chlorine * 2, Sulfur) .color(0xcf7f3e) .build(); Methyldichlorophosphine = new Material.Builder(8428, SuSyUtility.susyId('methyldichlorophosphine')) .liquid() - .components(Carbon, 1, Hydrogen, 3, Chlorine, 2, Phosphorus, 1) + .components(Carbon, Hydrogen * 3, Chlorine * 2, Phosphorus) .colorAverage() .build(); SulfurylChloride = new Material.Builder(8429, SuSyUtility.susyId('sulfuryl_chloride')) .liquid() - .components(Sulfur, 1, Oxygen, 2, Chlorine, 2) + .components(Sulfur, Oxygen * 2, Chlorine * 2) .colorAverage() .build(); MethylphosphonylDichloride = new Material.Builder(8430, SuSyUtility.susyId('methylphosphonyl_dichloride')) .liquid() - .components(Carbon, 1, Hydrogen, 3, Chlorine, 2, Oxygen, 1, Phosphorus, 1) + .components(Carbon, Hydrogen * 3, Chlorine * 2, Oxygen, Phosphorus) .colorAverage() .build(); MethylphosphonylDifluoride = new Material.Builder(8431, SuSyUtility.susyId('methylphosphonyl_difluoride')) .liquid() - .components(Carbon, 1, Hydrogen, 3, Phosphorus, 1, Oxygen, 1, Fluorine, 2) + .components(Carbon, Hydrogen * 3, Phosphorus, Oxygen, Fluorine * 2) .colorAverage() .build(); Sarin = new Material.Builder(8432, SuSyUtility.susyId('sarin')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Fluorine, 1, Oxygen, 2, Phosphorus, 1) + .components(Carbon * 4, Hydrogen * 10, Fluorine, Oxygen * 2, Phosphorus) .colorAverage() .build(); MethylDiethylphosphinate = new Material.Builder(8433, SuSyUtility.susyId('methyl_diethylphosphinate')) .liquid() - .components(Carbon, 5, Hydrogen, 13, Oxygen, 2, Phosphorus, 1) + .components(Carbon * 5, Hydrogen * 13, Oxygen * 2, Phosphorus) .colorAverage() .build(); DiisopropylaminoEthylEthylMethylphosphonite = new Material.Builder(8434, SuSyUtility.susyId('diisopropylamino_ethyl_ethyl_methylphosphonite')) .liquid() - .components(Carbon, 11, Hydrogen, 26, Nitrogen, 1, Oxygen, 2, Phosphorus, 1) + .components(Carbon * 11, Hydrogen * 26, Nitrogen, Oxygen * 2, Phosphorus) .colorAverage() .build(); VX = new Material.Builder(8435, SuSyUtility.susyId('vx')) .liquid() - .components(Carbon, 11, Hydrogen, 26, Nitrogen, 1, Oxygen, 2, Phosphorus, 1, Sulfur, 1) + .components(Carbon * 11, Hydrogen * 26, Nitrogen, Oxygen * 2, Phosphorus, Sulfur) .colorAverage() .build(); TitaniumEthoxide = new Material.Builder(8436, SuSyUtility.susyId('titanium_ethoxide')) .liquid() - .components(Titanium, 4, Carbon, 32, Hydrogen, 80, Oxygen, 16) + .components(Titanium * 4, Carbon * 32, Hydrogen * 80, Oxygen * 16) .colorAverage() .build(); DilutedPhosphoricAcid = new Material.Builder(8437, SuSyUtility.susyId('diluted_phosphoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(PhosphoricAcid, 3, Water, 1) + .components(PhosphoricAcid * 3, Water) .colorAverage() .build() MonocalciumPhosphate = new Material.Builder(8438, SuSyUtility.susyId('monocalcium_phosphate')) .dust() - .components(Calcium, 1, Hydrogen, 4, Phosphorus, 2, Oxygen, 8) + .components(Calcium, Hydrogen * 4, Phosphorus * 2, Oxygen * 8) .color(0xc2bc13) .iconSet(SAND) .build() @@ -2245,7 +2245,7 @@ public class FirstDegreeMaterials { CalciumPhosphite = new Material.Builder(8439, SuSyUtility.susyId('calcium_phosphite')) .dust() - .components(Calcium, 3, Phosphorus, 2, Oxygen, 6) + .components(Calcium * 3, Phosphorus * 2, Oxygen * 6) .color(0xa2a832) .iconSet(CERTUS) .build() @@ -2254,63 +2254,63 @@ public class FirstDegreeMaterials { SulfurTrioxideReactionMixture = new Material.Builder(8440, SuSyUtility.susyId('sulfur_trioxide_reaction_mixture')) .gas() - .components(SulfurDioxide, 1, Oxygen, 1) + .components(SulfurDioxide, Oxygen) .colorAverage() .build() CalciumMetasilicate = new Material.Builder(8441, SuSyUtility.susyId('calcium_metasilicate')) .dust() - .components(Calcium, 1, Silicon, 1, Oxygen, 3) + .components(Calcium, Silicon, Oxygen * 3) .colorAverage() .build() HighPurityPhosphorusVaporMixture = new Material.Builder(8442, SuSyUtility.susyId('high_purity_phosphorus_vapor_mixture')) .gas(new FluidBuilder().temperature(554)) - .components(Phosphorus, 4, Water, 1) + .components(Phosphorus * 4, Water) .colorAverage() .build() .setFormula("(P)(H2O)", true); PotassiumAmylXanthate = new Material.Builder(8443, SuSyUtility.susyId('potassium_amyl_xanthate')) .dust() - .components(Carbon, 6, Hydrogen, 11, Potassium, 1, Oxygen, 1, Sulfur, 2) + .components(Carbon * 6, Hydrogen * 11, Potassium, Oxygen, Sulfur * 2) .colorAverage() .build() GoldAmalgam = new Material.Builder(8444, SuSyUtility.susyId('gold_amalgam')) .liquid() - .components(Gold, 1, Mercury, 1) + .components(Gold, Mercury) .colorAverage() .build(); HotSulfuricAcid = new Material.Builder(8445, SuSyUtility.susyId('hot_sulfuric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(353)) - .components(Hydrogen, 2, Sulfur, 1, Oxygen, 4) + .components(Hydrogen * 2, Sulfur, Oxygen * 4) .color(0xff570f) .build() CadmiumSulfateSolution = new Material.Builder(8446, SuSyUtility.susyId('cadmium_sulfate_solution')) .liquid() - .components(Cadmium, 1, Sulfur, 1, Oxygen, 4, Water, 1) + .components(Cadmium, Sulfur, Oxygen * 4, Water) .colorAverage() .build() CadmiumSulfateSolution.setFormula("(CdSO4)(H2O)", true) MercuryOxide = new Material.Builder(8447, SuSyUtility.susyId('mercury_oxide')) .dust() - .components(Mercury, 1, Oxygen, 1) + .components(Mercury, Oxygen) .colorAverage() .build() IndiumChloride = new Material.Builder(8448, SuSyUtility.susyId('indium_chloride')) .dust() - .components(Indium, 1, Chlorine, 3) + .components(Indium, Chlorine * 3) .colorAverage() .build() IndiumHydroxide = new Material.Builder(8449, SuSyUtility.susyId('indium_hydroxide')) .dust() - .components(Indium, 1, Oxygen, 3, Hydrogen, 3) + .components(Indium, Oxygen * 3, Hydrogen * 3) .colorAverage() .build() @@ -2318,76 +2318,76 @@ public class FirstDegreeMaterials { TitaniumDioxide = new Material.Builder(8450, SuSyUtility.susyId('titanium_dioxide')) .dust() - .components(Titanium, 1, Oxygen, 2) + .components(Titanium, Oxygen * 2) .color(0xffffff) .iconSet(SHINY) .build() IndiumOxide = new Material.Builder(8451, SuSyUtility.susyId('indium_oxide')) .dust() - .components(Indium, 2, Oxygen, 3) + .components(Indium * 2, Oxygen * 3) .colorAverage() .build() EthanolWaterAzeotrope = new Material.Builder(8452, SuSyUtility.susyId('ethanol_water_azeotrope')) .liquid() - .components(Ethanol, 91, Water, 9) + .components(Ethanol * 91, Water * 9) .color(0xad552f) .build(); EntrainedEthanolWaterAzeotrope = new Material.Builder(8453, SuSyUtility.susyId('entrained_ethanol_water_azeotrope')) .liquid() - .components(Ethanol, 91, Water, 9, Toluene, 10) + .components(Ethanol * 91, Water * 9, Toluene * 10) .colorAverage() .build(); CalciumSulfite = new Material.Builder(8454, SuSyUtility.susyId('calcium_sulfite')) .dust() - .components(Calcium, 1, Sulfur, 1, Oxygen, 3) + .components(Calcium, Sulfur, Oxygen * 3) .colorAverage() .build(); SilicaGel = new Material.Builder(8455, SuSyUtility.susyId('silica_gel')) .dust() .iconSet(SHINY) - .components(Silicon, 1, Oxygen, 2) + .components(Silicon, Oxygen * 2) .color(0x6d6e63) .build(); WetSilicaGel = new Material.Builder(8456, SuSyUtility.susyId('wet_silica_gel')) .dust() - .components(Silicon, 1, Oxygen, 2) + .components(Silicon, Oxygen * 2) .color(0x585950) .build(); PhosphoricAcidSilicaGel = new Material.Builder(8457, SuSyUtility.susyId('phosphoric_acid_silica_gel')) .dust() .iconSet(SHINY) - .components(SilicaGel, 1, PhosphoricAcid, 1) + .components(SilicaGel, PhosphoricAcid) .colorAverage() .build(); SodiumChromateMixture = new Material.Builder(8458, SuSyUtility.susyId('sodium_chromate_mixture')) .dust() - .components(Sodium, 1, Chrome, 1, Oxygen, 4, SodaAsh, 1) + .components(Sodium, Chrome, Oxygen * 4, SodaAsh) .color(0xfaff7d) .build(); SodiumChromateSolution = new Material.Builder(8459, SuSyUtility.susyId('sodium_chromate_solution')) .liquid() - .components(Sodium, 1, Chrome, 1, Oxygen, 4, Water, 1) + .components(Sodium, Chrome, Oxygen * 4, Water) .color(0xa4a839) .build(); LeadChloride = new Material.Builder(8460, SuSyUtility.susyId('lead_chloride')) .dust().liquid(new FluidBuilder().temperature(774)) - .components(Lead, 1, Chlorine, 2) + .components(Lead, Chlorine * 2) .colorAverage() .build(); SodiumVanadateSolution = new Material.Builder(8461, SuSyUtility.susyId('sodium_vanadate_solution')) .liquid() - .components(Sodium, 1, Vanadium, 1, Oxygen, 3, Water, 1) + .components(Sodium, Vanadium, Oxygen * 3, Water) .colorAverage() .build(); @@ -2395,21 +2395,21 @@ public class FirstDegreeMaterials { AmmoniumMetavanadate = new Material.Builder(8462, SuSyUtility.susyId('ammonium_metavanadate')) .dust() - .components(Nitrogen, 1, Hydrogen, 4, Vanadium, 1, Oxygen, 3) + .components(Nitrogen, Hydrogen * 4, Vanadium, Oxygen * 3) .colorAverage() .build(); CobaltAluminate = new Material.Builder(8463, SuSyUtility.susyId('cobalt_aluminate')) .dust() .iconSet(SHINY) - .components(Cobalt, 1, Aluminium, 2, Oxygen, 4) + .components(Cobalt, Aluminium * 2, Oxygen * 4) .color(0x1605ff) .build(); LeadNitrate = new Material.Builder(8464, SuSyUtility.susyId('lead_nitrate')) .dust() .iconSet(SHINY) - .components(Lead, 1, Nitrogen, 2, Oxygen, 6) + .components(Lead, Nitrogen * 2, Oxygen * 6) .color(0xffffff) .build(); @@ -2417,7 +2417,7 @@ public class FirstDegreeMaterials { AmmoniumChromeAlum = new Material.Builder(8465, SuSyUtility.susyId('ammonium_chrome_alum')) .dust() - .components(Nitrogen, 1, Hydrogen, 4, Chrome, 1, Sulfur, 2, Oxygen, 8) + .components(Nitrogen, Hydrogen * 4, Chrome, Sulfur * 2, Oxygen * 8) .color(0x4e1554) .iconSet(SHINY) .build(); @@ -2426,7 +2426,7 @@ public class FirstDegreeMaterials { AmmoniumIronIISulfate = new Material.Builder(8466, SuSyUtility.susyId('ammonium_iron_ii_sulfate')) .dust() - .components(Iron, 1, Nitrogen, 2, Hydrogen, 8, Sulfur, 2, Oxygen, 8) + .components(Iron, Nitrogen * 2, Hydrogen * 8, Sulfur * 2, Oxygen * 8) .color(0x70cc6e) .iconSet(SHINY) .build(); @@ -2435,14 +2435,14 @@ public class FirstDegreeMaterials { ElectrolyticChromium = new Material.Builder(8467, SuSyUtility.susyId('electrolytic_chromium')) .dust().liquid(new FluidBuilder().temperature(2180)) - .components(Chrome, 1) + .components(Chrome) .colorAverage() .iconSet(SAND) .build(); IronIIHydroxide = new Material.Builder(8468, SuSyUtility.susyId('iron_ii_hydroxide')) .dust() - .components(Iron, 1, Oxygen, 2, Hydrogen, 2) + .components(Iron, Oxygen * 2, Hydrogen * 2) .color(0x072406) .build(); @@ -2450,32 +2450,32 @@ public class FirstDegreeMaterials { SodiumAmide = new Material.Builder(8469, SuSyUtility.susyId('sodium_amide')) .dust() - .components(Sodium, 1, Nitrogen, 1, Hydrogen, 2) + .components(Sodium, Nitrogen, Hydrogen * 2) .colorAverage() .build(); LeadChromate = new Material.Builder(8470, SuSyUtility.susyId('lead_chromate')) .dust() .iconSet(SHINY) - .components(Lead, 1, Chrome, 1, Oxygen, 4) + .components(Lead, Chrome, Oxygen * 4) .color(0xfffb00) .build(); IronIIOxide = new Material.Builder(8471, SuSyUtility.susyId('iron_ii_oxide')) .dust() - .components(Iron, 1, Oxygen, 1) + .components(Iron, Oxygen) .color(0x1c1c1c) .build(); GalliumTrioxide = new Material.Builder(8472, SuSyUtility.susyId('gallium_trioxide')) .dust() - .components(Gallium, 2, Oxygen, 3) + .components(Gallium * 2, Oxygen * 3) .colorAverage() .build(); AmmoniumDihydrogenPhosphate = new Material.Builder(8473, SuSyUtility.susyId('ammonium_dihydrogen_phosphate')) .dust() - .components(Hydrogen, 6, Nitrogen, 1, Oxygen, 4, Phosphorus, 1) + .components(Hydrogen * 6, Nitrogen, Oxygen * 4, Phosphorus) .colorAverage() .build(); @@ -2485,14 +2485,14 @@ public class FirstDegreeMaterials { IronCarbonate = new Material.Builder(8475, SuSyUtility.susyId('iron_carbonate')) .dust() - .components(Iron, 1, Carbon, 1, Oxygen, 3) + .components(Iron, Carbon, Oxygen * 3) .colorAverage() .build(); AmmoniumDiuranate = new Material.Builder(8477, SuSyUtility.susyId('ammonium_diuranate')) .dust() .iconSet(SHINY) - .components(Nitrogen, 2, Hydrogen, 8, Uranium238, 2, Oxygen, 7) + .components(Nitrogen * 2, Hydrogen * 8, Uranium238, Oxygen * 7) .color(0xe6be22) .build(); @@ -2500,13 +2500,13 @@ public class FirstDegreeMaterials { MagnesiumCarbonate = new Material.Builder(8478, SuSyUtility.susyId('magnesium_carbonate')) .dust() - .components(Magnesium, 1, Carbon, 1, Oxygen, 3) + .components(Magnesium, Carbon, Oxygen * 3) .colorAverage() .build(); SodiumLeadAlloy = new Material.Builder(8479, SuSyUtility.susyId('sodium_lead_alloy')) .ingot() - .components(Sodium, 1, Lead, 1) + .components(Sodium, Lead) .colorAverage() .build(); @@ -2514,13 +2514,13 @@ public class FirstDegreeMaterials { UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry')) .liquid() - .components(UltramaficTailings, 1, Water, 1) + .components(UltramaficTailings, Water) .color(0x878170) .build(); RutileSlurry = new Material.Builder(8487, SuSyUtility.susyId('rutile_slurry')) .liquid() - .components(Rutile, 1, Water, 1) + .components(Rutile, Water) .color(0xe8e6e2) .build(); @@ -2528,7 +2528,7 @@ public class FirstDegreeMaterials { ImpureTitaniumTetrachloride = new Material.Builder(8488, SuSyUtility.susyId('impure_titanium_tetrachloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TitaniumTetrachloride, 1) + .components(TitaniumTetrachloride) .color(0x54474a) .build(); @@ -2536,7 +2536,7 @@ public class FirstDegreeMaterials { DistilledTitaniumTetrachloride = new Material.Builder(8489, SuSyUtility.susyId('distilled_titanium_tetrachloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TitaniumTetrachloride, 1) + .components(TitaniumTetrachloride) .color(0x8c6c73) .build(); @@ -2544,7 +2544,7 @@ public class FirstDegreeMaterials { VanadiumFreeTitaniumTetrachloride = new Material.Builder(8490, SuSyUtility.susyId('vanadium_free_titanium_tetrachloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TitaniumTetrachloride, 1) + .components(TitaniumTetrachloride) .color(0xa16270) .build(); @@ -2552,37 +2552,37 @@ public class FirstDegreeMaterials { VanadiumOxydichloride = new Material.Builder(8491, SuSyUtility.susyId('vanadium_oxydichloride')) .dust() - .components(Vanadium, 1, Oxygen, 1, Chlorine, 2) + .components(Vanadium, Oxygen, Chlorine * 2) .color(0x1c1294) .build(); VanadiumOxytrichloride = new Material.Builder(8492, SuSyUtility.susyId('vanadium_oxytrichloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Vanadium, 1, Oxygen, 1, Chlorine, 3) + .components(Vanadium, Oxygen, Chlorine * 3) .color(0xbda51b) .build(); GaseousIronIIIChloride = new Material.Builder(8493, SuSyUtility.susyId('gaseous_iron_iii_chloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(590)) - .components(Iron3Chloride, 1) + .components(Iron3Chloride) .color(0xba8f49) .build(); GaseousTitaniumTetrachloride = new Material.Builder(8494, SuSyUtility.susyId('gaseous_titanium_tetrachloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(1180)) - .components(TitaniumTetrachloride, 1) + .components(TitaniumTetrachloride) .color(0x8f4064) .build(); TinTetrachloride = new Material.Builder(8495, SuSyUtility.susyId('tin_tetrachloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Tin, 1, Chlorine, 4) + .components(Tin, Chlorine * 4) .color(0x887866) .build(); GaseousAluminiumChloride = new Material.Builder(8496, SuSyUtility.susyId('gaseous_aluminium_chloride')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(460)) - .components(AluminiumChloride, 1) + .components(AluminiumChloride) .colorAverage() .build(); @@ -2590,19 +2590,19 @@ public class FirstDegreeMaterials { SodiumNitrite = new Material.Builder(8499, SuSyUtility.susyId('sodium_nitrite')) .dust().liquid(new FluidBuilder().temperature(544)) - .components(Sodium, 1, Nitrogen, 1, Oxygen, 2) + .components(Sodium, Nitrogen, Oxygen * 2) .color(0xe7e899) .build(); SodiumOxide = new Material.Builder(8500, SuSyUtility.susyId('sodium_oxide')) .dust() - .components(Sodium, 2, Oxygen, 1) + .components(Sodium * 2, Oxygen) .colorAverage() .build(); AlluvialPGMSolution = new Material.Builder(8501, SuSyUtility.susyId('alluvial_pgm_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Iron, 1, Hydrogen, 6, Platinum, 3, Chlorine, 20, Water, 10) + .components(Iron, Hydrogen * 6, Platinum * 3, Chlorine * 20, Water * 10) .color(0xe06624) .build(); @@ -2610,7 +2610,7 @@ public class FirstDegreeMaterials { CementedAlluvialPGMSolution = new Material.Builder(8502, SuSyUtility.susyId('cemented_alluvial_pgm_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Zinc, 1, Hydrogen, 6, Platinum, 3, Chlorine, 20, Water, 8) + .components(Zinc, Hydrogen * 6, Platinum * 3, Chlorine * 20, Water * 8) .color(0xb87627) .build(); @@ -2618,7 +2618,7 @@ public class FirstDegreeMaterials { AmmoniumHexachloroplatinate = new Material.Builder(8503, SuSyUtility.susyId('ammonium_hexachloroplatinate')) .dust() - .components(Nitrogen, 2, Hydrogen, 8, Platinum, 1, Chlorine, 6) + .components(Nitrogen * 2, Hydrogen * 8, Platinum, Chlorine * 6) .color(0xe6c532) .build(); @@ -2626,59 +2626,59 @@ public class FirstDegreeMaterials { DilutedCopperSulfateSolution = new Material.Builder(8504, SuSyUtility.susyId('diluted_copper_sulfate_solution')) .liquid() - .components(CopperSulfate, 2, Water, 3) + .components(CopperSulfate * 2, Water * 3) .colorAverage() .build(); NickelSulfateSolution = new Material.Builder(8505, SuSyUtility.susyId('nickel_sulfate_solution')) .liquid() - .components(Nickel, 1, Sulfur, 1, Oxygen, 4, Water, 1) + .components(Nickel, Sulfur, Oxygen * 4, Water) .color(0x38add1) .build(); NickelSulfateSolution.setFormula("(NiSO4)(H2O)", true) DisulfurDichloride = new Material.Builder(8506, SuSyUtility.susyId('disulfur_dichloride')) .liquid() - .components(Sulfur, 2, Chlorine, 2) + .components(Sulfur * 2, Chlorine * 2) .color(0xccc31d) .build(); AcidWashedSiliconDioxide = new Material.Builder(8507, SuSyUtility.susyId('acid_washed_silicon_dioxide')) .dust() - .components(SiliconDioxide, 1) + .components(SiliconDioxide) .color(0xc8c8c8) .iconSet(SHINY) .build(); AluminiumNitride = new Material.Builder(8508, SuSyUtility.susyId('aluminium_nitride')) .dust() - .components(Aluminium, 1, Nitrogen, 1) + .components(Aluminium, Nitrogen) .colorAverage() .build(); AluminiumOxynitride = new Material.Builder(8509, SuSyUtility.susyId('aluminium_oxynitride')) .dust() .flags(GENERATE_PLATE) - .components(Aluminium, 23, Oxygen, 27, Nitrogen, 5) + .components(Aluminium * 23, Oxygen * 27, Nitrogen * 5) .color(0xc7dfed) .iconSet(GLASS) .build(); HydrogenIodide = new Material.Builder(8510, SuSyUtility.susyId('hydrogen_iodide')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Iodine, 1) + .components(Hydrogen, Iodine) .colorAverage() .build(); AntimonyTrichloride = new Material.Builder(8511, SuSyUtility.susyId('antimony_trichloride')) .dust().liquid(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(347)) - .components(Antimony, 1, Chlorine, 3) + .components(Antimony, Chlorine * 3) .colorAverage() .build(); AntimonyPentachloride = new Material.Builder(8512, SuSyUtility.susyId('antimony_pentachloride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Antimony, 1, Chlorine, 5) + .components(Antimony, Chlorine * 5) .colorAverage() .build(); @@ -2686,13 +2686,13 @@ public class FirstDegreeMaterials { MolybdenumTrisulfide = new Material.Builder(8517, SuSyUtility.susyId('molybdenum_trisulfide')) .dust() - .components(Molybdenum, 1, Sulfur, 3) + .components(Molybdenum, Sulfur * 3) .colorAverage() .build(); AmmoniumIsopolytungstateSolution = new Material.Builder(8518, SuSyUtility.susyId('ammonium_isopolytungstate_solution')) .liquid() - .components(Nitrogen, 5, Hydrogen, 21, Tungsten, 6, Oxygen, 21, Water, 5) + .components(Nitrogen * 5, Hydrogen * 21, Tungsten * 6, Oxygen * 21, Water * 5) .colorAverage() .build(); @@ -2700,7 +2700,7 @@ public class FirstDegreeMaterials { AmmoniumParatungstate = new Material.Builder(8519, SuSyUtility.susyId('ammonium_paratungstate')) .dust() - .components(Nitrogen, 10, Hydrogen, 42, Tungsten, 12, Oxygen, 42, Water, 4) + .components(Nitrogen * 10, Hydrogen * 42, Tungsten * 12, Oxygen * 42, Water * 4) .colorAverage() .build(); @@ -2708,7 +2708,7 @@ public class FirstDegreeMaterials { ManganeseIIHydroxide = new Material.Builder(8520, SuSyUtility.susyId('manganese_ii_hydroxide')) .dust() - .components(Manganese, 1, Oxygen, 2, Hydrogen, 2) + .components(Manganese, Oxygen * 2, Hydrogen * 2) .colorAverage() .build(); @@ -2716,7 +2716,7 @@ public class FirstDegreeMaterials { SodiumTungstateSolution = new Material.Builder(8521, SuSyUtility.susyId('sodium_tungstate_solution')) .liquid() - .components(Sodium, 2, Tungsten, 1, Oxygen, 4, Water, 1) + .components(Sodium * 2, Tungsten, Oxygen * 4, Water) .colorAverage() .build(); @@ -2724,7 +2724,7 @@ public class FirstDegreeMaterials { ImpureMolybdenumTrioxide = new Material.Builder(8522, SuSyUtility.susyId('impure_molybdenum_trioxide')) .dust() - .components(Molybdenum, 1, Oxygen, 3) + .components(Molybdenum, Oxygen * 3) .color(0x154f25) .build(); @@ -2732,7 +2732,7 @@ public class FirstDegreeMaterials { AmmoniumDimolybdate = new Material.Builder(8523, SuSyUtility.susyId('ammonium_dimolybdate')) .dust() - .components(Nitrogen, 2, Hydrogen, 8, Molybdenum, 2, Oxygen, 7) + .components(Nitrogen * 2, Hydrogen * 8, Molybdenum * 2, Oxygen * 7) .colorAverage() .build(); @@ -2740,20 +2740,20 @@ public class FirstDegreeMaterials { PurifiedMolybdenumTrioxide = new Material.Builder(8524, SuSyUtility.susyId('purified_molybdenum_trioxide')) .dust() - .components(Molybdenum, 1, Oxygen, 3) + .components(Molybdenum, Oxygen * 3) .color(0x0f5c23) .iconSet(SHINY) .build(); MolybdenumTrioxide = new Material.Builder(8525, SuSyUtility.susyId('molybdenum_trioxide')) .dust() - .components(Molybdenum, 1, Oxygen, 3) + .components(Molybdenum, Oxygen * 3) .color(0x0f5c23) .build(); AmmoniumMolybdateSolution = new Material.Builder(8526, SuSyUtility.susyId('ammonium_molybdate_solution')) .liquid() - .components(Nitrogen, 2, Hydrogen, 8, Molybdenum, 1, Oxygen, 4, Water, 1) + .components(Nitrogen * 2, Hydrogen * 8, Molybdenum, Oxygen * 4, Water) .colorAverage() .build(); @@ -2761,13 +2761,13 @@ public class FirstDegreeMaterials { PhosphorusPentasulfide = new Material.Builder(8527, SuSyUtility.susyId('phosphorus_pentasulfide')) .dust() - .components(Phosphorus, 2, Sulfur, 5) + .components(Phosphorus * 2, Sulfur * 5) .colorAverage() .build(); SodiumDithiophosphateSolution = new Material.Builder(8528, SuSyUtility.susyId('sodium_dithiophosphate_solution')) .liquid() - .components(Sodium, 3, Phosphorus, 1, Oxygen, 2, Sulfur, 2, Water, 2) + .components(Sodium * 3, Phosphorus, Oxygen * 2, Sulfur * 2, Water * 2) .color(0xa69737) .build(); @@ -2775,7 +2775,7 @@ public class FirstDegreeMaterials { AlkaliFusedWulfenite = new Material.Builder(8529, SuSyUtility.susyId('alkali_fused_wulfenite')) .dust() - .components(Lead, 1, Molybdenum, 1, Sodium, 2, Hydrogen, 2, Oxygen, 6) + .components(Lead, Molybdenum, Sodium * 2, Hydrogen * 2, Oxygen * 6) .color(0xff805e) .build(); @@ -2783,7 +2783,7 @@ public class FirstDegreeMaterials { LeadIIHydroxide = new Material.Builder(8530, SuSyUtility.susyId('lead_ii_hydroxide')) .dust() - .components(Lead, 1, Oxygen, 2, Hydrogen, 2) + .components(Lead, Oxygen * 2, Hydrogen * 2) .colorAverage() .build(); @@ -2791,7 +2791,7 @@ public class FirstDegreeMaterials { SodiumMolybdateSolution = new Material.Builder(8531, SuSyUtility.susyId('sodium_molybdate_solution')) .liquid() - .components(Sodium, 2, Molybdenum, 1, Oxygen, 4, Water, 1) + .components(Sodium * 2, Molybdenum, Oxygen * 4, Water) .colorAverage() .build(); @@ -2801,7 +2801,7 @@ public class FirstDegreeMaterials { TitaniumIodide = new Material.Builder(8534, SuSyUtility.susyId('titanium_iodide')) .dust() - .components(Titanium, 1, Iodine, 4) + .components(Titanium, Iodine * 4) .colorAverage() .build(); @@ -2809,14 +2809,14 @@ public class FirstDegreeMaterials { FusedZirconia = new Material.Builder(8538, SuSyUtility.susyId('fused_zirconia')) .dust() - .components(Zirconium, 1, Oxygen, 2) + .components(Zirconium, Oxygen * 2) .colorAverage() .iconSet(GLASS) .build(); ImpureZirconiumTetrachloride = new Material.Builder(8539, SuSyUtility.susyId('impure_zirconium_tetrachloride')) .dust() - .components(Zirconium, 1, Chlorine, 4) + .components(Zirconium, Chlorine * 4) .color(0x519c78) .build(); @@ -2824,7 +2824,7 @@ public class FirstDegreeMaterials { ZirconiumSulfateSolution = new Material.Builder(8540, SuSyUtility.susyId('zirconium_sulfate_solution')) .liquid() - .components(Zirconium, 1, Sulfur, 2, Oxygen, 8, Water, 3) + .components(Zirconium, Sulfur * 2, Oxygen * 8, Water * 3) .color(0x4fa15c) .build(); @@ -2832,7 +2832,7 @@ public class FirstDegreeMaterials { ZirconylChlorideSolution = new Material.Builder(8541, SuSyUtility.susyId('zirconyl_chloride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Zirconium, 1, Oxygen, 1, Chlorine, 2, HydrogenChloride, 2, Water, 2) + .components(Zirconium, Oxygen, Chlorine * 2, HydrogenChloride * 2, Water * 2) .color(0x38a149) .build(); @@ -2840,7 +2840,7 @@ public class FirstDegreeMaterials { PurifiedZirconylChlorideSolution = new Material.Builder(8542, SuSyUtility.susyId('purified_zirconyl_chloride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Zirconium, 1, Oxygen, 1, Chlorine, 2, HydrogenChloride, 2, Water, 2) + .components(Zirconium, Oxygen, Chlorine * 2, HydrogenChloride * 2, Water * 2) .color(0x4ab55c) .build(); @@ -2848,7 +2848,7 @@ public class FirstDegreeMaterials { ZirconiumBasicSulfate = new Material.Builder(8543, SuSyUtility.susyId('zirconium_basic_sulfate')) .dust() - .components(Zirconium, 5, Sulfur, 2, Oxygen, 16) + .components(Zirconium * 5, Sulfur * 2, Oxygen * 16) .color(0x5fb54a) .build(); @@ -2856,13 +2856,13 @@ public class FirstDegreeMaterials { ZirconiumTetrachloride = new Material.Builder(8544, SuSyUtility.susyId('zirconium_tetrachloride')) .dust().liquid(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(710)) - .components(Zirconium, 1, Chlorine, 4) + .components(Zirconium, Chlorine * 4) .color(0x32ad72) .build(); HafniumSulfateSolution = new Material.Builder(8545, SuSyUtility.susyId('hafnium_sulfate_solution')) .liquid() - .components(Hafnium, 1, Sulfur, 2, Oxygen, 8, Water, 2) + .components(Hafnium, Sulfur * 2, Oxygen * 8, Water * 2) .color(0xbbd1b0) .build(); @@ -2870,13 +2870,13 @@ public class FirstDegreeMaterials { HafniumDioxide = new Material.Builder(8546, SuSyUtility.susyId('hafnium_dioxide')) .dust() - .components(Hafnium, 1, Oxygen, 2) + .components(Hafnium, Oxygen * 2) .colorAverage() .build(); ImpureHafniumTetrachloride = new Material.Builder(8547, SuSyUtility.susyId('impure_hafnium_tetrachloride')) .dust() - .components(Hafnium, 1, Chlorine, 4) + .components(Hafnium, Chlorine * 4) .color(0xabccae) .build(); @@ -2884,25 +2884,25 @@ public class FirstDegreeMaterials { ZirconiumIodide = new Material.Builder(8548, SuSyUtility.susyId('zirconium_iodide')) .dust() - .components(Zirconium, 1, Iodine, 4) + .components(Zirconium, Iodine * 4) .colorAverage() .build(); HafniumIodide = new Material.Builder(8549, SuSyUtility.susyId('hafnium_iodide')) .dust() - .components(Hafnium, 1, Iodine, 4) + .components(Hafnium, Iodine * 4) .colorAverage() .build(); CalciumZirconate = new Material.Builder(8550, SuSyUtility.susyId('calcium_zirconate')) .dust() - .components(Calcium, 1, Zirconium, 1, Oxygen, 3) + .components(Calcium, Zirconium, Oxygen * 3) .colorAverage() .build(); NickelIINitrateSolution = new Material.Builder(8551, SuSyUtility.susyId('nickel_nitrate_solution')) .liquid() - .components(Nickel, 1, Nitrogen, 2, Oxygen, 6, Water, 1) + .components(Nickel, Nitrogen * 2, Oxygen * 6, Water) .colorAverage() .build(); @@ -2910,7 +2910,7 @@ public class FirstDegreeMaterials { FerroniobiumTantalum = new Material.Builder(8552, SuSyUtility.susyId('ferroniobium_tantalum')) .dust() - .components(Iron, 30, Niobium, 65, Tantalum, 5) + .components(Iron * 30, Niobium * 65, Tantalum * 5) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build(); @@ -2918,20 +2918,20 @@ public class FirstDegreeMaterials { TantalumPentachloride = new Material.Builder(8553, SuSyUtility.susyId('tantalum_pentachloride')) .dust().gas(new FluidBuilder().temperature(513)) .flags(NO_UNIFICATION) - .components(Tantalum, 1, Chlorine, 5) + .components(Tantalum, Chlorine * 5) .colorAverage() .build(); NiobiumPentachloride = new Material.Builder(8554, SuSyUtility.susyId('niobium_pentachloride')) .dust().gas(new FluidBuilder().temperature(521)) .flags(NO_UNIFICATION) - .components(Niobium, 1, Chlorine, 5) + .components(Niobium, Chlorine * 5) .color(0xcfcf1d) .build(); NiobiumOxideDihydrate = new Material.Builder(8555, SuSyUtility.susyId('niobium_oxide_dihydrate')) .dust() - .components(Niobium, 2, Oxygen, 5, Water, 2) + .components(Niobium * 2, Oxygen * 5, Water * 2) .colorAverage() .build(); @@ -2939,7 +2939,7 @@ public class FirstDegreeMaterials { PurifiedFluoroniobicAcidSolution = new Material.Builder(8556, SuSyUtility.susyId('purified_fluoroniobic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 6, Niobium, 3, Fluorine, 9, Water, 6) + .components(Hydrogen * 6, Niobium * 3, Fluorine * 9, Water * 6) .colorAverage() .build(); @@ -2947,13 +2947,13 @@ public class FirstDegreeMaterials { NiobiumOxide = new Material.Builder(8557, SuSyUtility.susyId('niobium_oxide')) .dust() - .components(Niobium, 2, Oxygen, 5) + .components(Niobium * 2, Oxygen * 5) .colorAverage() .build(); FluorotantalicAcidSolution = new Material.Builder(8558, SuSyUtility.susyId('fluorotantalic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Tantalum, 1, Fluorine, 7, Water, 1) + .components(Hydrogen * 2, Tantalum, Fluorine * 7, Water) .colorAverage() .build(); @@ -2961,25 +2961,25 @@ public class FirstDegreeMaterials { PotassiumHeptafluorotantalate = new Material.Builder(8559, SuSyUtility.susyId('potassium_heptafluorotantalate')) .dust() - .components(Potassium, 2, Tantalum, 1, Fluorine, 7) + .components(Potassium * 2, Tantalum, Fluorine * 7) .colorAverage() .build(); DilutedAmmoniaSolution = new Material.Builder(8560, SuSyUtility.susyId('diluted_ammonia_solution')) .liquid() - .components(Ammonia, 1, Water, 2) + .components(Ammonia, Water * 2) .colorAverage() .build(); TantalumFluoride = new Material.Builder(8561, SuSyUtility.susyId('tantalum_fluoride')) .dust() - .components(Tantalum, 1, Fluorine, 5) + .components(Tantalum, Fluorine * 5) .colorAverage() .build(); AmmoniumPerrhenate = new Material.Builder(8562, SuSyUtility.susyId('ammonium_perrhenate')) .dust() - .components(Nitrogen, 1, Hydrogen, 4, Rhenium, 1, Oxygen, 4) + .components(Nitrogen, Hydrogen * 4, Rhenium, Oxygen * 4) .color(0x2b6cb3) .build(); @@ -2987,7 +2987,7 @@ public class FirstDegreeMaterials { NickelHydrotalcite = new Material.Builder(8564, SuSyUtility.susyId('nickel_hydrotalcite')) .dust() - .components(Nickel, 6, Aluminium, 2, ) + .components(Nickel * 6, Aluminium * 2, ) .color(0x9fb833) .build(); @@ -2995,26 +2995,26 @@ public class FirstDegreeMaterials { CalciumCyanamide = new Material.Builder(8565, SuSyUtility.susyId('calcium_cyanamide')) .dust() - .components(Calcium, 1, Carbon, 1, Nitrogen, 2) + .components(Calcium, Carbon, Nitrogen * 2) .colorAverage() .build(); AntimonyPentafluoride = new Material.Builder(8566, SuSyUtility.susyId('antimony_pentafluoride')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Antimony, 1, Fluorine, 5) + .components(Antimony, Fluorine * 5) .colorAverage() .build(); SodiumHexafluoroantimonate = new Material.Builder(8569, SuSyUtility.susyId('sodium_hexafluoroantimonate')) .dust() - .components(Sodium, 1, Antimony, 1, Fluorine, 6) + .components(Sodium, Antimony, Fluorine * 6) .colorAverage() .build(); AlluvialPGM = new Material.Builder(8570, SuSyUtility.susyId('alluvial_pgm')) .dust().ingot() .flags(DISABLE_DECOMPOSITION) - .components(Platinum, 2, Palladium, 1, Iron, 1) + .components(Platinum * 2, Palladium, Iron) .colorAverage() .build(); @@ -3022,7 +3022,7 @@ public class FirstDegreeMaterials { ImpureBariumSulfide = new Material.Builder(8572, SuSyUtility.susyId("impure_barium_sulfide")) .dust() - .components(Barium, 1, Sulfur, 1) + .components(Barium, Sulfur) .iconSet(DULL) .colorAverage() .build(); @@ -3031,7 +3031,7 @@ public class FirstDegreeMaterials { ImpureStrontiumSulfide = new Material.Builder(8573, SuSyUtility.susyId("impure_strontium_sulfide")) .dust() - .components(Strontium, 1, Sulfur, 1) + .components(Strontium, Sulfur) .iconSet(DULL) .colorAverage() .build(); @@ -3040,7 +3040,7 @@ public class FirstDegreeMaterials { StrontiumSulfideSolution = new Material.Builder(8574, SuSyUtility.susyId("strontium_sulfide_solution")) .liquid() - .components(Strontium, 1, Sulfur, 1, Water, 1) + .components(Strontium, Sulfur, Water) .colorAverage() .build(); @@ -3048,19 +3048,19 @@ public class FirstDegreeMaterials { StrontiumOxide = new Material.Builder(8575, SuSyUtility.susyId("strontium_oxide")) .dust() - .components(Strontium, 1, Oxygen, 1) + .components(Strontium, Oxygen) .colorAverage() .build(); DilutedAceticAcid = new Material.Builder(8576, SuSyUtility.susyId("diluted_acetic_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(AceticAcid, 1, Water, 1) + .components(AceticAcid, Water) .colorAverage() .build(); CobaltIIAcetate = new Material.Builder(8577, SuSyUtility.susyId("cobalt_ii_acetate")) .dust() - .components(Cobalt, 1, Carbon, 4, Oxygen, 6, Hydrogen, 4, Water, 4) + .components(Cobalt, Carbon * 4, Oxygen * 6, Hydrogen * 4, Water * 4) .color(0xfc7e89) .build(); @@ -3068,13 +3068,13 @@ public class FirstDegreeMaterials { PotassiumPyrosulfate = new Material.Builder(8578, SuSyUtility.susyId("potassium_pyrosulfate")) .dust() - .components(Potassium, 2, Sulfur, 2, Oxygen, 7) + .components(Potassium * 2, Sulfur * 2, Oxygen * 7) .colorAverage() .build(); IronIIINitrateSolution = new Material.Builder(8579, SuSyUtility.susyId("iron_iii_nitrate_solution")) .liquid() - .components(Iron, 1, Nitrogen, 3, Oxygen, 9, Water, 3) + .components(Iron, Nitrogen * 3, Oxygen * 9, Water * 3) .colorAverage() .build(); @@ -3082,49 +3082,49 @@ public class FirstDegreeMaterials { ChlorosulfuricAcid = new Material.Builder(8580, SuSyUtility.susyId("chlorosulfuric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 1, Sulfur, 1, Oxygen, 3, Chlorine, 1) + .components(Hydrogen, Sulfur, Oxygen * 3, Chlorine) .colorAverage() .build(); ManganeseIIChloride = new Material.Builder(8581, SuSyUtility.susyId("manganese_ii_chloride")) .dust() - .components(Manganese, 1, Chlorine, 2) + .components(Manganese, Chlorine * 2) .colorAverage() .build(); ChloroplatinicAcidSolution = new Material.Builder(8582, SuSyUtility.susyId("chloroplatinic_acid_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Platinum, 1, Chlorine, 6, Water, 4) + .components(Hydrogen * 2, Platinum, Chlorine * 6, Water * 4) .colorAverage() .build(); MolybdenumDisulfide = new Material.Builder(8583, SuSyUtility.susyId("molybdenum_disulfide")) .dust() - .components(Molybdenum, 1, Sulfur, 2) + .components(Molybdenum, Sulfur * 2) .colorAverage() .build(); FluorinatedGraphite = new Material.Builder(8584, SuSyUtility.susyId("fluorinated_graphite")) .dust() - .components(Carbon, 1, Fluorine, 1) + .components(Carbon, Fluorine) .colorAverage() .build(); AcrylicCatalyst = new Material.Builder(8585, SuSyUtility.susyId("acrylic_catalyst")) .dust() - .components(Copper, 1, Nickel, 1, Bromine, 4) + .components(Copper, Nickel, Bromine * 4) .colorAverage() .build(); GelatinSolution = new Material.Builder(8586, SuSyUtility.susyId("gelatin_solution")) .liquid(new FluidBuilder().temperature(323)) - .components(Gelatin, 1, Water, 1) + .components(Gelatin, Water) .colorAverage() .build(); PhosphomolybdicAcid = new Material.Builder(8587, SuSyUtility.susyId("phosphomolybdic_acid")) .dust() - .components(Hydrogen, 3, Phosphorus, 1, Molybdenum, 12, Oxygen, 40) + .components(Hydrogen * 3, Phosphorus, Molybdenum * 12, Oxygen * 40) .color(0xb39c07) .build(); @@ -3133,7 +3133,7 @@ public class FirstDegreeMaterials { UraniumDioxide = new Material.Builder(8588, SuSyUtility.susyId("uranium_dioxide")) .dust() .iconSet(SAND) - .components(Uranium238, 1, Oxygen, 2) + .components(Uranium238, Oxygen * 2) .color(0x20291b) .build(); @@ -3142,7 +3142,7 @@ public class FirstDegreeMaterials { UraniumTetrafluoride = new Material.Builder(8589, SuSyUtility.susyId("uranium_tetrafluoride")) .dust() .iconSet(SAND) - .components(Uranium238, 1, Fluorine, 4) + .components(Uranium238, Fluorine * 4) .color(0x58826a) .build(); @@ -3150,37 +3150,37 @@ public class FirstDegreeMaterials { SiliconTetrachloride = new Material.Builder(8590, SuSyUtility.susyId('silicon_tetrachloride')) .liquid() - .components(Silicon, 1, Chlorine, 4) + .components(Silicon, Chlorine * 4) .color(0x63827f) .build(); PurifiedSiliconTetrachloride = new Material.Builder(8591, SuSyUtility.susyId('purified_silicon_tetrachloride')) .liquid() - .components(Silicon, 1, Chlorine, 4) + .components(Silicon, Chlorine * 4) .color(0x7fa3a0) .build(); SaltyHydrofluoricAcid = new Material.Builder(8592, SuSyUtility.susyId("salty_hydrofluoric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Salt, 1, HydrofluoricAcid, 1) + .components(Salt, HydrofluoricAcid) .colorAverage() .build(); WaferTreatmentAcid = new Material.Builder(8593, SuSyUtility.susyId("wafer_treatment_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(HydrochloricAcid, 9, HydrofluoricAcid, 9, AceticAcid, 2) + .components(HydrochloricAcid * 9, HydrofluoricAcid * 9, AceticAcid * 2) .color(0x3e7d68) .build(); ThalliumIChloride = new Material.Builder(8594, SuSyUtility.susyId("thallium_i_chloride")) .dust() - .components(Thallium, 1, Chlorine, 1) + .components(Thallium, Chlorine) .colorAverage() .build(); AcidicThalliumSulfateSolution = new Material.Builder(8595, SuSyUtility.susyId("acidic_thallium_sulfate_solution")) .liquid() - .components(Thallium, 2, Sulfur, 1, Oxygen, 4, HydrogenChloride, 2, Water, 1) + .components(Thallium * 2, Sulfur, Oxygen * 4, HydrogenChloride * 2, Water) .colorAverage() .build(); @@ -3188,7 +3188,7 @@ public class FirstDegreeMaterials { ThalliumSulfateSolution = new Material.Builder(8596, SuSyUtility.susyId("thallium_sulfate_solution")) .liquid() - .components(Thallium, 2, Sulfur, 1, Oxygen, 4, Water, 1) + .components(Thallium * 2, Sulfur, Oxygen * 4, Water) .colorAverage() .build(); @@ -3200,31 +3200,31 @@ public class FirstDegreeMaterials { PurifiedCadmiumSolution = new Material.Builder(8599, SuSyUtility.susyId('purified_cadmium_solution')) .liquid() - .components(Cadmium, 1, Sulfur, 1, Oxygen, 4, Water, 1) + .components(Cadmium, Sulfur, Oxygen * 4, Water) .colorAverage() .build() GermaniumTetrachloride = new Material.Builder(8600, SuSyUtility.susyId('germanium_tetrachloride')) .liquid() - .components(Germanium, 1, Chlorine, 4) + .components(Germanium, Chlorine * 4) .color(0xbae6dd) .build() GermaniumDioxide = new Material.Builder(8601, SuSyUtility.susyId('germanium_dioxide')) .dust() - .components(Germanium, 1, Oxygen, 2) + .components(Germanium, Oxygen * 2) .color(0x4b9485) .build() IronOxalateDihydrate = new Material.Builder(8602, SuSyUtility.susyId('iron_oxalate_dihydrate')) .dust() - .components(Iron, 1, Carbon, 2, Oxygen, 4, Water, 2) + .components(Iron, Carbon * 2, Oxygen * 4, Water * 2) .colorAverage() .build() IndiumIIISulfateSolution = new Material.Builder(8603, SuSyUtility.susyId('indium_iii_sulfate_solution')) .liquid() - .components(Indium, 2, Sulfur, 3, Oxygen, 12, Water, 6) + .components(Indium * 2, Sulfur * 3, Oxygen * 12, Water * 6) .color(0x8d18ad) .build() @@ -3232,7 +3232,7 @@ public class FirstDegreeMaterials { ZincSulfateSolution = new Material.Builder(8604, SuSyUtility.susyId('zinc_sulfate_solution')) .liquid() - .components(Zinc, 1, Sulfur, 1, Oxygen, 4, Water, 2) + .components(Zinc, Sulfur, Oxygen * 4, Water * 2) .colorAverage() .build() @@ -3240,7 +3240,7 @@ public class FirstDegreeMaterials { SodiumSelenateSolution = new Material.Builder(8605, SuSyUtility.susyId('sodium_selenate_solution')) .liquid() - .components(Sodium, 2, Selenium, 1, Oxygen, 4, Water, 1) + .components(Sodium * 2, Selenium, Oxygen * 4, Water) .color(0xb0bf97) .build() @@ -3248,7 +3248,7 @@ public class FirstDegreeMaterials { SodiumSeleniteSolution = new Material.Builder(8606, SuSyUtility.susyId('sodium_selenite_solution')) .liquid() - .components(Sodium, 2, Selenium, 1, Oxygen, 3, Water, 1) + .components(Sodium * 2, Selenium, Oxygen * 3, Water) .color(0x96a67c) .build() @@ -3256,19 +3256,19 @@ public class FirstDegreeMaterials { HydrogenSelenide = new Material.Builder(8607, SuSyUtility.susyId('hydrogen_selenide')) .gas() - .components(Hydrogen, 2, Selenium, 1) + .components(Hydrogen * 2, Selenium) .color(0xcadb93) .build() TelluriumDioxide = new Material.Builder(8608, SuSyUtility.susyId('tellurium_dioxide')) .dust() - .components(Tellurium, 1, Oxygen, 2) + .components(Tellurium, Oxygen * 2) .color(0xb1d4b0) .build() SodiumTelluriteSolution = new Material.Builder(8609, SuSyUtility.susyId('sodium_tellurite_solution')) .liquid() - .components(Sodium, 2, Tellurium, 1, Oxygen, 3, Water, 3) + .components(Sodium * 2, Tellurium, Oxygen * 3, Water * 3) .color(0xb0d4c6) .build() @@ -3276,7 +3276,7 @@ public class FirstDegreeMaterials { SodiumAlum = new Material.Builder(8610, SuSyUtility.susyId("sodium_alum")) .dust() - .components(Sodium, 1, Aluminium, 1, Sulfur, 2, Oxygen, 8) + .components(Sodium, Aluminium, Sulfur * 2, Oxygen * 8) .colorAverage() .build() @@ -3284,7 +3284,7 @@ public class FirstDegreeMaterials { CaesiumAlum = new Material.Builder(8611, SuSyUtility.susyId("caesium_alum")) .dust() - .components(Caesium, 1, Aluminium, 1, Sulfur, 2, Oxygen, 8) + .components(Caesium, Aluminium, Sulfur * 2, Oxygen * 8) .color(0x293c9e) .build() @@ -3292,7 +3292,7 @@ public class FirstDegreeMaterials { RubidiumAlum = new Material.Builder(8612, SuSyUtility.susyId("rubidium_alum")) .dust() - .components(Rubidium, 1, Aluminium, 1, Sulfur, 2, Oxygen, 8) + .components(Rubidium, Aluminium, Sulfur * 2, Oxygen * 8) .color(0xc72882) .build() @@ -3300,25 +3300,25 @@ public class FirstDegreeMaterials { CaesiumSulfateSolution = new Material.Builder(8613, SuSyUtility.susyId("caesium_sulfate_solution")) .liquid() - .components(Caesium, 2, Sulfur, 1, Oxygen, 4) + .components(Caesium * 2, Sulfur, Oxygen * 4) .color(0x8528c7) .build() CaesiumChloride = new Material.Builder(8614, SuSyUtility.susyId("caesium_chloride")) .dust() - .components(Caesium, 1, Chlorine, 1) + .components(Caesium, Chlorine) .color(0x2885c7) .build() ReducedCaesiumMixture = new Material.Builder(8615, SuSyUtility.susyId("reduced_caesium_mixture")) .dust() - .components(Caesium, 2, CalciumChloride, 1) + .components(Caesium * 2, CalciumChloride) .color(0xf7f7d0) .build() CaesiumHydroxideSolution = new Material.Builder(8616, SuSyUtility.susyId("caesium_hydroxide_solution")) .liquid() - .components(Caesium, 1, Oxygen, 1, Hydrogen, 1, Water, 1) + .components(Caesium, Oxygen, Hydrogen, Water) .color(0x5458bf) .build() @@ -3326,13 +3326,13 @@ public class FirstDegreeMaterials { CaesiumFormateSolution = new Material.Builder(8617, SuSyUtility.susyId("caesium_formate_solution")) .liquid() - .components(Caesium, 1, Carbon, 1, Hydrogen, 1, Oxygen, 2) + .components(Caesium, Carbon, Hydrogen, Oxygen * 2) .color(0x7b54bf) .build() RubidiumHydroxide = new Material.Builder(8618, SuSyUtility.susyId("rubidium_hydroxide")) .dust() - .components(Rubidium, 1, Oxygen, 1, Hydrogen, 1) + .components(Rubidium, Oxygen, Hydrogen) .color(0xbf54bb) .build() } diff --git a/groovy/material/OreMaterials.groovy b/groovy/material/OreMaterials.groovy index 404d06c78..a10bcf003 100755 --- a/groovy/material/OreMaterials.groovy +++ b/groovy/material/OreMaterials.groovy @@ -26,14 +26,14 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0xd2f7f6) - .components(Lithium, 1, Aluminium, 1, Silicon, 4, Oxygen, 10) + .components(Lithium, Aluminium, Silicon * 4, Oxygen * 10) .build(); Amblygonite = new Material.Builder(7001, SuSyUtility.susyId('amblygonite')) .dust().ore() .flags(NO_SMELTING) .color(0xf7f5d2) - .components(Lithium, 1, Aluminium, 1, Phosphorus, 1, Oxygen, 4, Fluorine, 1) + .components(Lithium, Aluminium, Phosphorus, Oxygen * 4, Fluorine) .build() Amblygonite.setFormula('(Li,Na)AlPO4(F,OH)', true); @@ -42,7 +42,7 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0xb38969) - .components(Scandium, 1, Yttrium, 1, Silicon, 2, Oxygen, 7) + .components(Scandium, Yttrium, Silicon * 2, Oxygen * 7) .build() Thortveitite.setFormula('(Sc,Y)2Si2O7', true); @@ -52,14 +52,14 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x0b3d1d) - .components(Calcium, 1, Titanium, 1, Oxygen, 3) + .components(Calcium, Titanium, Oxygen * 3) .build(); Titanomagnetite = new Material.Builder(7004, SuSyUtility.susyId('titanomagnetite')) .dust().ore() .flags(NO_SMELTING) .color(0x555c45) - .components(Iron, 1, Titanium, 1, Oxygen, 4) + .components(Iron, Titanium, Oxygen * 4) .build() Titanomagnetite.setFormula('Fe(Fe,Ti)2O4', true); @@ -69,7 +69,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0xcc9681) - .components(Calcium, 5, Phosphorus, 3, Oxygen, 12, Fluorine, 1) + .components(Calcium * 5, Phosphorus * 3, Oxygen * 12, Fluorine) .build() Fluorapatite.setFormula('Ca5(PO4)3F', true); @@ -78,7 +78,7 @@ public class OreMaterials{ .dust().ore().fluid(SusyFluidStorageKeys.SLURRY, new FluidBuilder()).fluid(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) .flags(NO_SMELTING, GENERATE_FLOTATED) .color(0x87685c) - .components(Vanadium, 1, Iron, 1, Titanium, 1, Oxygen, 4) + .components(Vanadium, Iron, Titanium, Oxygen * 4) .build() VanadiferousTitanomagnetite.setFormula('(V,Fe,Ti)2O4', true); @@ -87,7 +87,7 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0x3a4f43) - .components(Zirconium, 1, Oxygen, 2) + .components(Zirconium, Oxygen * 2) .build() Baddeleyite.setFormula('ZrO2', true); @@ -97,7 +97,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0xbf5915) - .components(Lead, 5, Vanadium, 3, Oxygen, 12, Chlorine, 1) + .components(Lead * 5, Vanadium * 3, Oxygen * 12, Chlorine) .build() Vanadinite.setFormula('Pb5(VO4)3Cl', true); @@ -106,14 +106,14 @@ public class OreMaterials{ .dust().ore().fluid(SusyFluidStorageKeys.SLURRY, new FluidBuilder()).fluid(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) .flags(NO_SMELTING) .color(0xe0d9ba) - .components(Lead, 1, Carbon, 1, Oxygen, 3) + .components(Lead, Carbon, Oxygen * 3) .build(); Anglesite = new Material.Builder(7010, SuSyUtility.susyId('anglesite')) .dust().ore().fluid(SusyFluidStorageKeys.SLURRY, new FluidBuilder()).fluid(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) .flags(NO_SMELTING) .color(0xe0ded5) - .components(Lead, 1, Sulfur, 1, Oxygen, 4) + .components(Lead, Sulfur, Oxygen * 4) .build(); Enargite = new Material.Builder(7011, SuSyUtility.susyId('enargite')) @@ -121,14 +121,14 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0xc9c7bd) - .components(Copper, 3, Arsenic, 1, Sulfur, 4) + .components(Copper * 3, Arsenic, Sulfur * 4) .build(); Smithsonite = new Material.Builder(7012, SuSyUtility.susyId('smithsonite')) .dust().ore().fluid(SusyFluidStorageKeys.SLURRY, new FluidBuilder()).fluid(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) .flags(NO_SMELTING) .color(0x6aadab) - .components(Zinc, 1, Carbon, 1, Oxygen, 3) + .components(Zinc, Carbon, Oxygen * 3) .build(); Arsenopyrite = new Material.Builder(7013, SuSyUtility.susyId('arsenopyrite')) @@ -136,7 +136,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x7d7269) - .components(Iron, 1, Arsenic, 1, Sulfur, 1) + .components(Iron, Arsenic, Sulfur) .build(); Acanthite = new Material.Builder(7014, SuSyUtility.susyId('acanthite')) @@ -144,7 +144,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x2c332d) - .components(Silver, 2, Sulfur, 1) + .components(Silver * 2, Sulfur) .build(); Pyrargyrite = new Material.Builder(7015, SuSyUtility.susyId('pyrargyrite')) @@ -152,7 +152,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x362a2a) - .components(Silver, 3, Antimony, 1, Sulfur, 3) + .components(Silver * 3, Antimony, Sulfur * 3) .build(); Stephanite = new Material.Builder(7016, SuSyUtility.susyId('stephanite')) @@ -160,7 +160,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x3d3d36) - .components(Silver, 5, Antimony, 1, Sulfur, 4) + .components(Silver * 5, Antimony, Sulfur * 4) .build(); Proustite = new Material.Builder(7017, SuSyUtility.susyId('proustite')) @@ -168,7 +168,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x73142d) - .components(Silver, 3, Arsenic, 1, Sulfur, 3) + .components(Silver * 3, Arsenic, Sulfur * 3) .build(); Celestine = new Material.Builder(7018, SuSyUtility.susyId('celestine')) @@ -176,7 +176,7 @@ public class OreMaterials{ .flags(NO_SMELTING, GENERATE_SIFTED, GENERATE_FLOTATED) .color(0xafe3e0) .iconSet(SHINY) - .components(Strontium, 1, Sulfur, 1, Oxygen, 4) + .components(Strontium, Sulfur, Oxygen * 4) .build(); Strontianite = new Material.Builder(7019, SuSyUtility.susyId('strontianite')) @@ -184,21 +184,21 @@ public class OreMaterials{ .flags(NO_SMELTING) .color(0xe3d3af) .iconSet(SHINY) - .components(Strontium, 1, Carbon, 1, Oxygen, 3) + .components(Strontium, Carbon, Oxygen * 3) .build(); Witherite = new Material.Builder(7020, SuSyUtility.susyId('witherite')) .dust().ore() .flags(NO_SMELTING) .color(0xd1d0bc) - .components(Barium, 1, Carbon, 1, Oxygen, 3) + .components(Barium, Carbon, Oxygen * 3) .build(); Wolframite = new Material.Builder(7021, SuSyUtility.susyId('wolframite')) .dust().ore().fluid(SusyFluidStorageKeys.SLURRY, new FluidBuilder()).fluid(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder()) .flags(NO_SMELTING, GENERATE_SIFTED, GENERATE_FLOTATED) .color(0x1e1c36) - .components(Iron, 1, Manganese, 1, Tungsten, 1, Oxygen, 4) + .components(Iron, Manganese, Tungsten, Oxygen * 4) .build() Wolframite.setFormula('(Fe,Mn)WO4', true); @@ -207,14 +207,14 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0x292726) - .components(Rhodium, 3, Lead, 2, Sulfur, 2) + .components(Rhodium * 3, Lead * 2, Sulfur * 2) .build(); Bowieite = new Material.Builder(7023, SuSyUtility.susyId('bowieite')) .dust().ore() .flags(NO_SMELTING) .color(0x323325) - .components(Rhodium, 2, Sulfur, 3) + .components(Rhodium * 2, Sulfur * 3) .build() Bowieite.setFormula('(Rh,Ir,Pt)2S3', true); @@ -223,7 +223,7 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0x2e360a) - .components(Palladium, 1, Bismuth, 1, Lead, 1) + .components(Palladium, Bismuth, Lead) .build() .setFormula('Pd(Bi,Pb)', true); @@ -231,21 +231,21 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0x5e5654) - .components(Mercury, 1, Antimony, 4, Sulfur, 8) + .components(Mercury, Antimony * 4, Sulfur * 8) .build(); Bismuthinite = new Material.Builder(7026, SuSyUtility.susyId('bismuthinite')) .dust().ore() .flags(NO_SMELTING) .color(0x85795b) - .components(Bismuth, 2, Sulfur, 3) + .components(Bismuth * 2, Sulfur * 3) .build(); Lorandite = new Material.Builder(7027, SuSyUtility.susyId('lorandite')) .dust().gem().ore() .flags(NO_SMELTING) .color(0x913111) - .components(Thallium, 1, Arsenic, 1, Sulfur, 2) + .components(Thallium, Arsenic, Sulfur * 2) .build(); Hutchinsonite = new Material.Builder(7028, SuSyUtility.susyId('hutchinsonite')) @@ -253,7 +253,7 @@ public class OreMaterials{ .flags(NO_SMELTING) .iconSet(SHINY) .color(0x332f2e) - .components(Thallium, 1, Lead, 1, Arsenic, 5, Sulfur, 9) + .components(Thallium, Lead, Arsenic * 5, Sulfur * 9) .build() Hutchinsonite.setFormula('(Tl,Pb)2As5S9', true); @@ -262,14 +262,14 @@ public class OreMaterials{ .dust().ore() .flags(NO_SMELTING) .color(0x3e4a3f) - .components(Copper, 7, Thallium, 1, Silver, 1, Selenium, 4) + .components(Copper * 7, Thallium, Silver, Selenium * 4) .build() Crookesite.setFormula('Cu7(Tl,Ag)Se4', true); Dilithium = new Material.Builder(7032, SuSyUtility.susyId('dilithium')) .gem().ore() - .components(Lithium, 2) + .components(Lithium * 2) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build(); @@ -277,14 +277,14 @@ public class OreMaterials{ Lignite = new Material.Builder(7033, SuSyUtility.susyId('lignite')) .gem(1, 600).ore(2, 1) .color(0x644646).iconSet(LIGNITE) - .components(Carbon, 1) + .components(Carbon) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); Anthracite = new Material.Builder(7034, SuSyUtility.susyId('anthracite')) .gem(1, 2000).ore(2, 1) .color(0x241212).iconSet(LIGNITE) - .components(Carbon, 1) + .components(Carbon) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); @@ -296,7 +296,7 @@ public class OreMaterials{ Sperrylite = new Material.Builder(7036, SuSyUtility.susyId('sperrylite')) .gem().ore() - .components(Platinum, 1, Arsenic, 2) + .components(Platinum, Arsenic * 2) .iconSet(SHINY) .color(0xb3af86) .build(); @@ -304,21 +304,21 @@ public class OreMaterials{ Kernite = new Material.Builder(7037, SuSyUtility.susyId('kernite')) .dust() .color(0xd9c1a0) - .components(Sodium, 2, Boron, 4, Oxygen, 8, Hydrogen, 2, Water, 3) + .components(Sodium * 2, Boron * 4, Oxygen * 8, Hydrogen * 2, Water * 3) .build() .setFormula('Na2B4O6(OH)2 * (H2O)3', true); Colemanite = new Material.Builder(7038, SuSyUtility.susyId('colemanite')) .dust() .color(0xdbcd8f) - .components(Calcium, 2, Boron, 6, Oxygen, 11, Water, 5) + .components(Calcium * 2, Boron * 6, Oxygen * 11, Water * 5) .build() .setFormula('Ca2B6O11 * (H2O)5', true); Ulexite = new Material.Builder(7039, SuSyUtility.susyId('ulexite')) .dust() .color(0xc2aba1) - .components(Sodium, 1, Calcium, 1, Boron, 5, Oxygen, 12, Hydrogen, 6, Water, 5) + .components(Sodium, Calcium, Boron * 5, Oxygen * 12, Hydrogen * 6, Water * 5) .build() .setFormula('NaCaB5O6(OH)6 * (H2O)5', true); @@ -326,7 +326,7 @@ public class OreMaterials{ .dust() .iconSet(SHINY) .color(0xffffff) - .components(Potassium, 1, Magnesium, 1, Chlorine, 3, Water, 6) + .components(Potassium, Magnesium, Chlorine * 3, Water * 6) .build() .setFormula('KCl.MgCl2 * (H2O)6', true); @@ -334,21 +334,21 @@ public class OreMaterials{ .dust() .iconSet(SHINY) .color(0xfff7c4) - .components(Potassium, 1, Magnesium, 1, Sulfur, 1, Oxygen, 4, Chlorine, 1, Water, 3) + .components(Potassium, Magnesium, Sulfur, Oxygen * 4, Chlorine, Water * 3) .build() .setFormula('KMg(SO4)Cl * (H2O)3', true); Kieserite = new Material.Builder(7042, SuSyUtility.susyId('kieserite')) .dust() .color(0xdccade) - .components(Magnesium, 1, Sulfur, 1, Oxygen, 4, Water, 1) + .components(Magnesium, Sulfur, Oxygen * 4, Water) .build() .setFormula('MgSO4 * H2O', true); Polyhalite = new Material.Builder(7043, SuSyUtility.susyId('polyhalite')) .dust() .color(0xe0b2a4) - .components(Potassium, 2, Calcium, 2, Magnesium, 1, Sulfur, 4, Oxygen, 16, Water, 2) + .components(Potassium * 2, Calcium * 2, Magnesium, Sulfur * 4, Oxygen * 16, Water * 2) .build() .setFormula('K2Ca2Mg(SO4)4 * (H2O)2', true); @@ -356,14 +356,14 @@ public class OreMaterials{ .gem() .iconSet(SHINY) .color(0x967051) - .components(Calcium, 1, Titanium, 1, Silicon, 1, Oxygen, 5) + .components(Calcium, Titanium, Silicon, Oxygen * 5) .build(); Leucoxene = new Material.Builder(7046, SuSyUtility.susyId('leucoxene')) .dust() .iconSet(SHINY) .color(0xb987c4) - .components(Titanium, 1, Oxygen, 2) + .components(Titanium, Oxygen * 2) .build(); Zircon = new Material.Builder(7047, SuSyUtility.susyId('zircon')) // TODO: remove liquid for 2.8.6 @@ -371,14 +371,14 @@ public class OreMaterials{ .iconSet(SHINY) .flags(GENERATE_SIFTED, GENERATE_FLOTATED, GENERATE_CONCENTRATE) .color(0xf05c51) - .components(Zirconium, 1, Silicon, 1, Oxygen, 4) + .components(Zirconium, Silicon, Oxygen * 4) .build(); Mimetite = new Material.Builder(7048, SuSyUtility.susyId('mimetite')) .dust() .iconSet(SHINY) .color(0xe8aa2e) - .components(Lead, 5, Arsenic, 3, Oxygen, 12, Chlorine, 1) + .components(Lead * 5, Arsenic * 3, Oxygen * 12, Chlorine) .build() .setFormula('Pb5(AsO4)3Cl', true); @@ -386,7 +386,7 @@ public class OreMaterials{ .dust() .iconSet(SHINY) .color(0xd7e632) - .components(Lead, 5, Phosphorus, 4, Oxygen, 12, Chlorine, 1) + .components(Lead * 5, Phosphorus * 4, Oxygen * 12, Chlorine) .build() .setFormula('Pb5(PO4)3Cl', true); @@ -394,14 +394,14 @@ public class OreMaterials{ .dust() .iconSet(SHINY) .color(0x5e5d41) - .components(Lead, 1, Zinc, 1, Vanadium, 1, Oxygen, 5, Hydrogen, 1) + .components(Lead, Zinc, Vanadium, Oxygen * 5, Hydrogen) .build() .setFormula('(Pb,Zn)2VO4OH', true); Mottramite = new Material.Builder(7051, SuSyUtility.susyId('mottramite')) .dust() .color(0x53730a) - .components(Lead, 1, Copper, 1, Vanadium, 1, Oxygen, 5, Hydrogen, 1) + .components(Lead, Copper, Vanadium, Oxygen * 5, Hydrogen) .build() .setFormula('PbCu(VO4)(OH)', true); @@ -409,28 +409,28 @@ public class OreMaterials{ .dust().gem().ore() .iconSet(SHINY) .color(0xc7af85) - .components(Calcium, 5, Phosphorus, 3, Oxygen, 12, Chlorine, 1) + .components(Calcium * 5, Phosphorus * 3, Oxygen * 12, Chlorine) .build() .setFormula('Ca5(PO4)3Cl', true); Hematite = new Material.Builder(7053, SuSyUtility.susyId('hematite')) .dust() .color(0x240f0f) - .components(Iron, 2, Oxygen, 3) + .components(Iron * 2, Oxygen * 3) .build(); Skutterudite = new Material.Builder(7054, SuSyUtility.susyId('skutterudite')) .dust() .iconSet(SHINY) .color(0xabbec2) - .components(Cobalt, 1, Arsenic, 3) + .components(Cobalt, Arsenic * 3) .build(); Allanite = new Material.Builder(7055, SuSyUtility.susyId('allanite')) .dust() .iconSet(SHINY) .color(0x6b7a7d) - .components(Cerium, 1, Calcium, 1, Yttrium, 1, Lanthanum, 1, Aluminium, 1, Iron, 1, Silicon, 3, Oxygen, 13, Hydrogen, 1) + .components(Cerium, Calcium, Yttrium, Lanthanum, Aluminium, Iron, Silicon * 3, Oxygen * 13, Hydrogen) .build() .setFormula('(Ce,Ca,Y,La)2(Al,Fe)3(SiO4)3(OH)', true); @@ -438,28 +438,28 @@ public class OreMaterials{ .dust().gem() .iconSet(SHINY) .color(0x2216c9) - .components(Copper, 3, Carbon, 2, Oxygen, 8, Hydrogen, 2) + .components(Copper * 3, Carbon * 2, Oxygen * 8, Hydrogen * 2) .build() .setFormula('Cu3(CO3)2(OH)2', true); Goethite = new Material.Builder(7057, SuSyUtility.susyId('goethite')) .dust() .color(0x30251f) - .components(Iron, 1, Oxygen, 2, Hydrogen, 1) + .components(Iron, Oxygen * 2, Hydrogen) .build() .setFormula('α-FeO(OH)', true); Hydrozincite = new Material.Builder(7058, SuSyUtility.susyId('hydrozincite')) .dust() .color(0xebd5ca) - .components(Zinc, 5, Carbon, 2, Oxygen, 12, Hydrogen, 6) + .components(Zinc * 5, Carbon * 2, Oxygen * 12, Hydrogen * 6) .build() .setFormula('Zn5(CO3)2(OH)6', true); Chlorargyrite = new Material.Builder(7059, SuSyUtility.susyId('chlorargyrite')) .dust() .color(0x524728) - .components(Silver, 1, Chlorine, 1) + .components(Silver, Chlorine) .build(); Columbite = new Material.Builder(7060, SuSyUtility.susyId('columbite')) @@ -467,14 +467,14 @@ public class OreMaterials{ .color(0x574f2f) .iconSet(SHINY) .flags(GENERATE_SIFTED, GENERATE_FLOTATED, GENERATE_CONCENTRATE) - .components(Iron, 1, Manganese, 1, Niobium, 2, Oxygen, 6) + .components(Iron, Manganese, Niobium * 2, Oxygen * 6) .build() .setFormula('(Fe,Mn)Nb2O6', true); Ferrimolybdite = new Material.Builder(7061, SuSyUtility.susyId('ferrimolybdite')) .dust() .color(0xc1c71c) - .components(Iron, 2, Molybdenum, 3, Oxygen, 12, Water, 8) + .components(Iron * 2, Molybdenum * 3, Oxygen * 12, Water * 8) .build() .setFormula('Fe2(MoO4)3 * (H2O)8', true); @@ -482,33 +482,33 @@ public class OreMaterials{ .dust().gem() .color(0x303030) .iconSet(SHINY) - .components(Silver, 4, Selenium, 1, Sulfur, 1) + .components(Silver * 4, Selenium, Sulfur) .build(); Orpiment = new Material.Builder(7063, SuSyUtility.susyId('orpiment')) .dust().gem() .color(0xc28034) .iconSet(SHINY) - .components(Arsenic, 2, Sulfur, 3) + .components(Arsenic * 2, Sulfur * 3) .build(); Braggite = new Material.Builder(7064, SuSyUtility.susyId('braggite')) .ore() .color(0x686b5f) - .components(Platinum, 1, Palladium, 1, Nickel, 1, Sulfur, 1) + .components(Platinum, Palladium, Nickel, Sulfur) .build() .setFormula('(Pt,Pd,Ni)S', true); Stannite = new Material.Builder(7065, SuSyUtility.susyId('stannite')) .dust() .color(0x474f3e) - .components(Copper, 2, Iron, 1, Tin, 1, Sulfur, 4) + .components(Copper * 2, Iron, Tin, Sulfur * 4) .build(); Euxenite = new Material.Builder(7066, SuSyUtility.susyId('euxenite')) .dust() .color(0x9c973e) - .components(Yttrium, 1, Calcium, 1, Cerium, 1, Thorium, 1, Niobium, 1, Tantalum, 1, Titanium, 1, Oxygen, 6) + .components(Yttrium, Calcium, Cerium, Thorium, Niobium, Tantalum, Titanium, Oxygen * 6) .build() .setFormula('(Y,Ca,Ce,U,Th)(Nb,Ta,Ti)2O6', true); @@ -516,25 +516,25 @@ public class OreMaterials{ .dust() .iconSet(SHINY) .color(0x6e572e) - .components(Yttrium, 1, Phosphorus, 1, Oxygen, 4) + .components(Yttrium, Phosphorus, Oxygen * 4) .build(); Caliche = new Material.Builder(7068, SuSyUtility.susyId('caliche')) .dust() .color(0xb3ae98) - .components(Calcium, 1, Carbon, 1, Oxygen, 3) + .components(Calcium, Carbon, Oxygen * 3) .build(); Lauterite = new Material.Builder(7069, SuSyUtility.susyId('lauterite')) .dust() - .components(Calcium, 1, Iodine, 2, Oxygen, 6) + .components(Calcium, Iodine * 2, Oxygen * 6) .colorAverage() .build() .setFormula('Ca(IO3)2', true); Langbeinite = new Material.Builder(7070, SuSyUtility.susyId('langbeinite')) .dust() - .components(Potassium, 2, Magnesium, 2, Sulfur, 3, Oxygen, 12) + .components(Potassium * 2, Magnesium * 2, Sulfur * 3, Oxygen * 12) .colorAverage() .build() .setFormula('K2Mg2(SO4)3', true); @@ -543,20 +543,20 @@ public class OreMaterials{ .dust().gem().ore() .iconSet(SHINY) .color(0xc7afaa) - .components(Calcium, 5, Phosphorus, 3, Oxygen, 13, Hydrogen, 1) + .components(Calcium * 5, Phosphorus * 3, Oxygen * 13, Hydrogen) .build() .setFormula('Ca5(PO4)3OH', true); Rhodochrosite = new Material.Builder(7072, SuSyUtility.susyId('rhodochrosite')) .ore() .iconSet(SHINY) - .components(Manganese, 1, Carbon, 1, Oxygen, 3) + .components(Manganese, Carbon, Oxygen * 3) .colorAverage() .build(); Carnotite = new Material.Builder(7073, SuSyUtility.susyId('carnotite')) .ore() - .components(Potassium, 2, Uranium235, 2, Oxygen, 12, Vanadium, 2, Water, 3) + .components(Potassium * 2, Uranium235 * 2, Oxygen * 12, Vanadium * 2, Water * 3) .colorAverage() .build(); @@ -570,7 +570,7 @@ public class OreMaterials{ LigniteCoke = new Material.Builder(7075, SuSyUtility.susyId('lignite_coke')) .gem(1, 1200) .color(0x8f7070).iconSet(LIGNITE) - .components(Carbon, 1) + .components(Carbon) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .build(); diff --git a/groovy/material/OrganicChemistryMaterials.groovy b/groovy/material/OrganicChemistryMaterials.groovy index e5db54a0e..107b6536c 100644 --- a/groovy/material/OrganicChemistryMaterials.groovy +++ b/groovy/material/OrganicChemistryMaterials.groovy @@ -23,62 +23,62 @@ public class OrganicChemistryMaterials { FourChloronitrobenzene = new Material.Builder(15000, SuSyUtility.susyId('four_chloronitrobenzene')) .dust() - .components(Carbon, 6, Hydrogen, 4, Chlorine, 1, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 4, Chlorine * 1, Nitrogen * 1, Oxygen * 2) .colorAverage() .build(); FourNitroaniline = new Material.Builder(15001, SuSyUtility.susyId('four_nitroaniline')) .dust() - .components(Carbon, 6, Hydrogen, 6, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 6, Nitrogen * 2, Oxygen * 2) .colorAverage() .build(); ParaPhenylenediamine = new Material.Builder(15002, SuSyUtility.susyId('para_phenylenediamine')) .dust() - .components(Carbon, 6, Hydrogen, 8, Nitrogen, 2) + .components(Carbon * 6, Hydrogen * 8, Nitrogen * 2) .colorAverage() .build(); TwoTwoDichlorohydrazobenzene = new Material.Builder(15003, SuSyUtility.susyId('two_two_dichlorohydrazobenzene')) .dust() - .components(Carbon, 12, Hydrogen, 10, Chlorine, 2, Nitrogen, 2) + .components(Carbon * 12, Hydrogen * 10, Chlorine * 2, Nitrogen * 2) .colorAverage() .build(); SodiumPhenoxide = new Material.Builder(15004, SuSyUtility.susyId('sodium_phenoxide')) .dust() - .components(Carbon, 6, Hydrogen, 5, Sodium, 1, Oxygen, 1) + .components(Carbon * 6, Hydrogen * 5, Sodium * 1, Oxygen * 1) .colorAverage() .build(); IsophthaloylChloride = new Material.Builder(15005, SuSyUtility.susyId('isophthaloyl_chloride')) .dust() - .components(Carbon, 8, Hydrogen, 4, Chlorine, 2, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 4, Chlorine * 2, Oxygen * 2) .colorAverage() .build(); CaprolactamOxime = new Material.Builder(15006, SuSyUtility.susyId('caprolactam_oxime')) .dust() - .components(Carbon, 6, Hydrogen, 11, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 6, Hydrogen * 11, Nitrogen * 1, Oxygen * 1) .colorAverage() .build(); TNT = new Material.Builder(15007, SuSyUtility.susyId('tnt')) .dust() - .components(Carbon, 7, Hydrogen, 5, Nitrogen, 3, Oxygen, 6) + .components(Carbon * 7, Hydrogen * 5, Nitrogen * 3, Oxygen * 6) .color(0xacb38d) .build(); Polystyrene = new Material.Builder(15008, SuSyUtility.susyId('polystyrene')) .polymer(1) .liquid(new FluidBuilder().temperature(513)) - .components(Carbon, 8, Hydrogen, 8) + .components(Carbon * 8, Hydrogen * 8) .color(0xa2a389) .build(); OneTwoDichlorobenzene = new Material.Builder(15009, SuSyUtility.susyId('one_two_dichlorobenzene')) .dust() - .components(Carbon, 6, Hydrogen, 4, Chlorine, 2) + .components(Carbon * 6, Hydrogen * 4, Chlorine * 2) .colorAverage() .build(); @@ -87,29 +87,29 @@ public class OrganicChemistryMaterials { .liquid(new FluidBuilder().temperature(468)) .color(0xfde3ff) .flags(GENERATE_FOIL) - .components(Carbon, 2, Hydrogen, 2, Fluorine, 2) + .components(Carbon * 2, Hydrogen * 2, Fluorine * 2) .build() Methylenedianiline = new Material.Builder(15011, SuSyUtility.susyId('methylenedianiline')) .dust() - .components(Carbon, 13, Hydrogen, 14, Nitrogen, 2) + .components(Carbon * 13, Hydrogen * 14, Nitrogen * 2) .colorAverage() .build() MethyleneDiphenylDiisocyanate = new Material.Builder(15012, SuSyUtility.susyId('methylene_diphenyl_diisocyanate')) .dust() - .components(Carbon, 15, Hydrogen, 10, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 15, Hydrogen * 10, Nitrogen * 2, Oxygen * 2) .colorAverage() .build() EthyleneCarbonate = new Material.Builder(15013, SuSyUtility.susyId('ethylene_carbonate')) .liquid() - .components(Carbon, 3, Hydrogen, 4, Oxygen, 3) + .components(Carbon * 3, Hydrogen * 4, Oxygen * 3) .color(0x348060) .build() Rayon = new Material.Builder(15014, SuSyUtility.susyId('rayon')) - .components(Carbon, 6, Hydrogen, 10, Oxygen, 5) + .components(Carbon * 6, Hydrogen * 10, Oxygen * 5) .color(0xaee8d9) .build() @@ -118,13 +118,13 @@ public class OrganicChemistryMaterials { AlkaliCellulose = new Material.Builder(15015, SuSyUtility.susyId('alkali_cellulose')) .dust() - .components(Carbon, 6, Hydrogen, 9, Oxygen, 5, Sodium, 1) + .components(Carbon * 6, Hydrogen * 9, Oxygen * 5, Sodium * 1) .color(0x7d6547) .build() SodiumCelluloseXanthate = new Material.Builder(15016, SuSyUtility.susyId('sodium_cellulose_xanthate')) .dust() - .components(Carbon, 6, Hydrogen, 9, Oxygen, 5, Carbon, 1, Sulfur, 2, Sodium, 1) + .components(Carbon * 6, Hydrogen * 9, Oxygen * 5, Carbon * 1, Sulfur * 2, Sodium * 1) .color(0x7d6057) .build() @@ -133,18 +133,18 @@ public class OrganicChemistryMaterials { .liquid(new FluidBuilder().temperature(438)) .color(0x72e0c9) .flags(GENERATE_FOIL) - .components(Carbon, 5, Oxygen, 2, Hydrogen, 8) + .components(Carbon * 5, Oxygen * 2, Hydrogen * 8) .build() PhthalicAnhydride = new Material.Builder(15018, SuSyUtility.susyId('phthalic_anhydride')) .dust() - .components(Carbon, 8, Hydrogen, 4, Oxygen, 3) + .components(Carbon * 8, Hydrogen * 4, Oxygen * 3) .colorAverage() .build(); TributylPhosphate = new Material.Builder(15019, SuSyUtility.susyId('tributyl_phosphate')) .liquid() - .components(Carbon, 12, Hydrogen, 27, Oxygen, 4, Phosphorus, 1) + .components(Carbon * 12, Hydrogen * 27, Oxygen * 4, Phosphorus * 1) .color(0xf5e3b3) .build(); @@ -170,7 +170,7 @@ public class OrganicChemistryMaterials { ChloromethaneSolution = new Material.Builder(15024, SuSyUtility.susyId('chloromethane_solution')) .liquid() - .components(Chloromethane, 1, Water, 1) + .components(Chloromethane * 1, Water * 1) .colorAverage() .build(); @@ -178,7 +178,7 @@ public class OrganicChemistryMaterials { AcidicTetrafluoroethylene = new Material.Builder(15026, SuSyUtility.susyId('acidic_tetrafluoroethylene')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Tetrafluoroethylene, 1, HydrogenChloride, 4) + .components(Tetrafluoroethylene * 1, HydrogenChloride * 4) .color(0x726678) .build(); @@ -189,7 +189,7 @@ public class OrganicChemistryMaterials { TetranitronmethaneSolution = new Material.Builder(15028, SuSyUtility.susyId('tetranitromethane_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Tetranitromethane, 1, SulfuricAcid, 1, Water, 3) + .components(Tetranitromethane * 1, SulfuricAcid * 1, Water * 3) .color(0x373352) .build(); @@ -200,13 +200,13 @@ public class OrganicChemistryMaterials { ChlorinatedGlycerol = new Material.Builder(15030, SuSyUtility.susyId('chlorinated_glycerol')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 3, Hydrogen, 6, Oxygen, 1, Chlorine, 2) + .components(Carbon * 3, Hydrogen * 6, Oxygen * 1, Chlorine * 2) .colorAverage() .build(); EpichlorohydrinSolution = new Material.Builder(15031, SuSyUtility.susyId('epichlorohydrin_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Epichlorohydrin, 1, Salt, 1, Water, 3) + .components(Epichlorohydrin * 1, Salt * 1, Water * 3) .color(0x9c6241) .build(); @@ -217,31 +217,31 @@ public class OrganicChemistryMaterials { DilutedEpichlorohydrin = new Material.Builder(15033, SuSyUtility.susyId('diluted_epichlorohydrin')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Epichlorohydrin, 1, Salt, 1, Water, 1) + .components(Epichlorohydrin * 1, Salt * 1, Water * 1) .color(0x91664d) .build(); Isobutane = new Material.Builder(15034, SuSyUtility.susyId('isobutane')) .gas() - .components(Carbon, 4, Hydrogen, 10) + .components(Carbon * 4, Hydrogen * 10) .color(0x8a7566) .build(); Isobutylene = new Material.Builder(15035, SuSyUtility.susyId('isobutylene')) .gas() - .components(Carbon, 4, Hydrogen, 8) + .components(Carbon * 4, Hydrogen * 8) .color(0x917d61) .build(); TriarylsulfoniumHexafluoroantimonate = new Material.Builder(15036, SuSyUtility.susyId('triarylsulfonium_hexafluoroantimonate')) .dust() - .components(Carbon, 24, Hydrogen, 19, Fluorine, 6, Sulfur, 2, Antimony, 1) + .components(Carbon * 24, Hydrogen * 19, Fluorine * 6, Sulfur * 2, Antimony * 1) .color(0x31a374) .build(); NMethylTwoPyrrolidone = new Material.Builder(15037, SuSyUtility.susyId('n_methyl_two_pyrrolidone')) .liquid() - .components(Carbon, 5, Hydrogen, 9, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 5, Hydrogen * 9, Nitrogen * 1, Oxygen * 1) .colorAverage() .build(); @@ -249,13 +249,13 @@ public class OrganicChemistryMaterials { MethylAcetateSolution = new Material.Builder(15039, SuSyUtility.susyId('methyl_acetate_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 1, MethylAcetate, 1, Water, 1) + .components(SulfuricAcid * 1, MethylAcetate * 1, Water * 1) .colorAverage() .build(); TwoChloronitrobenzene = new Material.Builder(15040, SuSyUtility.susyId('two_chloronitrobenzene')) .dust().liquid(new FluidBuilder().temperature(306)) - .components(Carbon, 6, Hydrogen, 4, Chlorine, 1, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 4, Chlorine * 1, Nitrogen * 1, Oxygen * 2) .color(0xc7c944) .build(); @@ -266,13 +266,13 @@ public class OrganicChemistryMaterials { FourNitroanilineSolution = new Material.Builder(15042, SuSyUtility.susyId('four_nitroaniline_solution')) .liquid() - .components(Toluene, 1, FourNitroaniline, 1) + .components(Toluene * 1, FourNitroaniline * 1) .colorAverage() .build(); ParaPhenylenediamineSolution = new Material.Builder(15043, SuSyUtility.susyId('para_phenylenediamine_solution')) .liquid() - .components(Toluene, 1, ParaPhenylenediamine, 1) + .components(Toluene * 1, ParaPhenylenediamine * 1) .colorAverage() .build(); @@ -280,49 +280,49 @@ public class OrganicChemistryMaterials { DichlorobenzidineSolution = new Material.Builder(15045, SuSyUtility.susyId('dichlorobenzidine_solution')) .liquid() - .components(Toluene, 1, Dichlorobenzidine, 1) + .components(Toluene * 1, Dichlorobenzidine * 1) .colorAverage() .build(); Xylene = new Material.Builder(15046, SuSyUtility.susyId('xylene')) .liquid() - .components(Carbon, 8, Hydrogen, 10) + .components(Carbon * 8, Hydrogen * 10) .color(0x2e281f) .build(); Phosgene = new Material.Builder(15047, SuSyUtility.susyId('phosgene')) .liquid() - .components(Carbon, 1, Oxygen, 1, Chlorine, 2) + .components(Carbon * 1, Oxygen * 1, Chlorine * 2) .colorAverage() .build(); Dichloroethane = new Material.Builder(15048, SuSyUtility.susyId('dichloroethane')) .liquid() - .components(Carbon, 2, Hydrogen, 4, Chlorine, 2) + .components(Carbon * 2, Hydrogen * 4, Chlorine * 2) .colorAverage() .build(); Propionaldehyde = new Material.Builder(15049, SuSyUtility.susyId('propionaldehyde')) .liquid() - .components(Carbon, 3, Hydrogen, 6, Oxygen, 1) + .components(Carbon * 3, Hydrogen * 6, Oxygen * 1) .color(0x917b0f) .build(); Cyclohexylamine = new Material.Builder(15050, SuSyUtility.susyId('cyclohexylamine')) .liquid() - .components(Carbon, 6, Hydrogen, 13, Nitrogen, 1) + .components(Carbon * 6, Hydrogen * 13, Nitrogen * 1) .color(0xbfba8c) .build(); DiphenylIsophthalateSolution = new Material.Builder(15051, SuSyUtility.susyId('diphenyl_isophthalate_solution')) .liquid() - .components(DiphenylIsophtalate, 1, Dichloroethane, 1) + .components(DiphenylIsophtalate * 1, Dichloroethane * 1) .colorAverage() .build(); DiaminobenzidineSolution = new Material.Builder(15052, SuSyUtility.susyId('diaminobenzidine_solution')) .liquid() - .components(Diaminobenzidine, 1, Toluene, 1) + .components(Diaminobenzidine * 1, Toluene * 1) .colorAverage() .build(); @@ -340,13 +340,13 @@ public class OrganicChemistryMaterials { Dimethylacetamide = new Material.Builder(15056, SuSyUtility.susyId('dimethylacetamide')) .liquid() - .components(Carbon, 4, Hydrogen, 9, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 9, Nitrogen * 1, Oxygen * 1) .colorAverage() .build(); PBISolution = new Material.Builder(15057, SuSyUtility.susyId('pbi_solution')) .liquid() - .components(Dimethylacetamide, 1, Polybenzimidazole, 1) + .components(Dimethylacetamide * 1, Polybenzimidazole * 1) .color(0x171410) .build(); @@ -357,31 +357,31 @@ public class OrganicChemistryMaterials { Hydroxylamine = new Material.Builder(15059, SuSyUtility.susyId('hydroxylamine')) .liquid(new FluidBuilder().temperature(306)) - .components(Hydrogen, 3, Nitrogen, 1, Oxygen, 1) + .components(Hydrogen * 3, Nitrogen * 1, Oxygen * 1) .colorAverage() .build(); Cyclohexanone = new Material.Builder(15060, SuSyUtility.susyId('cyclohexanone')) .liquid() - .components(Hydrogen, 3, Nitrogen, 1, Oxygen, 1) + .components(Hydrogen * 3, Nitrogen * 1, Oxygen * 1) .color(0x2b1e11) .build(); NHexadecylammoniumAcetate = new Material.Builder(15061, SuSyUtility.susyId('n_hexadecylammonium_acetate')) .dust() - .components(Carbon, 16, Hydrogen, 39, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 16, Hydrogen * 39, Nitrogen * 1, Oxygen * 2) .color(0xffd4d4) .build(); CaprolactamSolution = new Material.Builder(15062, SuSyUtility.susyId('caprolactam_solution')) .liquid() - .components(AmmoniumSulfate, 1, Caprolactam, 1, Water, 2) + .components(AmmoniumSulfate * 1, Caprolactam * 1, Water * 2) .colorAverage() .build(); Chlorotrimethylsilane = new Material.Builder(15063, SuSyUtility.susyId("chlorotrimethylsilane")) .liquid() - .components(Carbon, 3, Hydrogen, 9, Silicon, 1, Chlorine, 1) + .components(Carbon * 3, Hydrogen * 9, Silicon * 1, Chlorine * 1) .color(0xd9dddc) .build(); @@ -389,7 +389,7 @@ public class OrganicChemistryMaterials { Methyldichlorosilane = new Material.Builder(15064, SuSyUtility.susyId("methyldichlorosilane")) .liquid() - .components(Carbon, 1, Hydrogen, 4, Chlorine, 2, Silicon, 1) + .components(Carbon * 1, Hydrogen * 4, Chlorine * 2, Silicon * 1) .color(0xd9dddc) .build(); @@ -397,7 +397,7 @@ public class OrganicChemistryMaterials { Methyltrichlorosilane = new Material.Builder(15065, SuSyUtility.susyId("methyltrichlorosilane")) .liquid() - .components(Carbon, 1, Hydrogen, 3, Silicon, 1, Chlorine, 3) + .components(Carbon * 1, Hydrogen * 3, Silicon * 1, Chlorine * 3) .color(0xd9dddc) .build(); @@ -407,73 +407,73 @@ public class OrganicChemistryMaterials { VinylChlorideSuspension = new Material.Builder(15067, SuSyUtility.susyId('vinyl_chloride_suspension')) .liquid() - .components(VinylChloride, 1, Water, 1) + .components(VinylChloride * 1, Water * 1) .colorAverage() .build(); PolyvinylChlorideSuspension = new Material.Builder(15068, SuSyUtility.susyId('polyvinyl_chloride_suspension')) .liquid() - .components(PolyvinylChloride, 1, Water, 1) + .components(PolyvinylChloride * 1, Water * 1) .colorAverage() .build(); StyreneSuspension = new Material.Builder(15069, SuSyUtility.susyId('styrene_suspension')) .liquid() - .components(Styrene, 1, Water, 1) + .components(Styrene * 1, Water * 1) .colorAverage() .build(); PolystyreneSuspension = new Material.Builder(15070, SuSyUtility.susyId('polystyrene_suspension')) .liquid() - .components(Polystyrene, 1, Water, 1) + .components(Polystyrene * 1, Water * 1) .colorAverage() .build(); VinylAcetateSuspension = new Material.Builder(15071, SuSyUtility.susyId('vinyl_acetate_suspension')) .liquid() - .components(Methanol, 1, VinylAcetate, 1) + .components(Methanol * 1, VinylAcetate * 1) .colorAverage() .build(); PolyvinylAcetateSuspension = new Material.Builder(15072, SuSyUtility.susyId('polyvinyl_acetate_suspension')) .liquid() - .components(Methanol, 1, PolyvinylAcetate, 1) + .components(Methanol * 1, PolyvinylAcetate * 1) .colorAverage() .build(); Bleach = new Material.Builder(15073, SuSyUtility.susyId('bleach')) .liquid() - .components(Sodium, 1, Chlorine, 1, Oxygen, 1, Water, 1) + .components(Sodium * 1, Chlorine * 1, Oxygen * 1, Water * 1) .colorAverage() .build(); ImpureBleach = new Material.Builder(15074, SuSyUtility.susyId('impure_bleach')) .liquid() - .components(Bleach, 1, Salt, 1, Water, 3) + .components(Bleach * 1, Salt * 1, Water * 3) .colorAverage() .build(); OneFourDichlorobenzeneSolution = new Material.Builder(15075, SuSyUtility.susyId('one_four_dichlorobenzene_solution')) .liquid() - .components(Toluene, 1, Dichlorobenzene, 1) + .components(Toluene * 1, Dichlorobenzene * 1) .colorAverage() .build(); OneTwoDichlorobenzeneSolution = new Material.Builder(15076, SuSyUtility.susyId('one_two_dichlorobenzene_solution')) .liquid() - .components(Toluene, 1, OneTwoDichlorobenzene, 1) + .components(Toluene * 1, OneTwoDichlorobenzene * 1) .colorAverage() .build(); StyreneButadieneSolution = new Material.Builder(15078, SuSyUtility.susyId('styrene_butadiene_solution')) .liquid() - .components(Styrene, 1, Butadiene, 3, Ethanol, 1) + .components(Styrene * 1, Butadiene * 3, Ethanol * 1) .colorAverage() .build(); OneBromobutane = new Material.Builder(15079, SuSyUtility.susyId('one_bromobutane')) .liquid() - .components(Carbon, 4, Hydrogen, 9, Bromine, 1) + .components(Carbon * 4, Hydrogen * 9, Bromine * 1) .colorAverage() .build(); @@ -481,7 +481,7 @@ public class OrganicChemistryMaterials { Butyllithium = new Material.Builder(15081, SuSyUtility.susyId('butyllithium')) .liquid() - .components(Carbon, 4, Hydrogen, 9, Lithium, 1) + .components(Carbon * 4, Hydrogen * 9, Lithium * 1) .colorAverage() .build(); @@ -494,19 +494,19 @@ public class OrganicChemistryMaterials { Acetylene = new Material.Builder(15086, SuSyUtility.susyId('acetylene')) .gas() - .components(Carbon, 2, Hydrogen, 2) + .components(Carbon * 2, Hydrogen * 2) .colorAverage() .build(); TetrapropylammoniumBromide = new Material.Builder(15087, SuSyUtility.susyId('tetrapropylammonium_bromide')) .dust() - .components(Carbon, 12, Hydrogen, 28, Bromine, 1, Nitrogen, 1) + .components(Carbon * 12, Hydrogen * 28, Bromine * 1, Nitrogen * 1) .color(0x916c0f) .build(); Formaldehyde = new Material.Builder(15088, SuSyUtility.susyId('formaldehyde')) .gas() - .components(Carbon, 1, Hydrogen, 2, Oxygen, 1) + .components(Carbon * 1, Hydrogen * 2, Oxygen * 1) .colorAverage() .build(); @@ -517,32 +517,32 @@ public class OrganicChemistryMaterials { Methylamine = new Material.Builder(15090, SuSyUtility.susyId('methylamine')) .liquid() - .components(Carbon, 1, Hydrogen, 5, Nitrogen, 1) + .components(Carbon * 1, Hydrogen * 5, Nitrogen * 1) .color(0x794c91) .build() .setFormula('CH3NH2', true); Trimethylamine = new Material.Builder(15091, SuSyUtility.susyId('trimethylamine')) .liquid() - .components(Carbon, 3, Hydrogen, 9, Nitrogen, 1) + .components(Carbon * 3, Hydrogen * 9, Nitrogen * 1) .color(0x4c2461) .build(); Butynediol = new Material.Builder(15092, SuSyUtility.susyId('butynediol')) .liquid(new FluidBuilder().temperature(331)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 2) .colorAverage() .build(); Butanediol = new Material.Builder(15093, SuSyUtility.susyId('butanediol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 2) .colorAverage() .build(); GammaButyrolactone = new Material.Builder(15094, SuSyUtility.susyId('gamma_butyrolactone')) .liquid() - .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 2) .color(0x4242f5) .build(); @@ -560,19 +560,19 @@ public class OrganicChemistryMaterials { Dichloromethane = new Material.Builder(15098, SuSyUtility.susyId('dichloromethane')) .liquid() - .components(Carbon, 1, Hydrogen, 2, Chlorine, 2) + .components(Carbon * 1, Hydrogen * 2, Chlorine * 2) .colorAverage() .build(); CarbonTetrachloride = new Material.Builder(15099, SuSyUtility.susyId('carbon_tetrachloride')) .liquid() - .components(Carbon, 1, Chlorine, 4) + .components(Carbon * 1, Chlorine * 4) .colorAverage() .build(); IsophthalicAcid = new Material.Builder(15100, SuSyUtility.susyId('isophthalic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0x8ac294) .build() @@ -586,7 +586,7 @@ public class OrganicChemistryMaterials { PolytetrafluoroethyleneSolution = new Material.Builder(15102, SuSyUtility.susyId('polytetrafluoroethylene_solution')) .liquid() - .components(Polytetrafluoroethylene, 1, Water, 1) + .components(Polytetrafluoroethylene * 1, Water * 1) .colorAverage() .build(); @@ -607,31 +607,31 @@ public class OrganicChemistryMaterials { Ethanolamine = new Material.Builder(15108, SuSyUtility.susyId('ethanolamine')) .liquid() - .components(Carbon, 2, Hydrogen, 7, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 2, Hydrogen * 7, Nitrogen * 1, Oxygen * 1) .color(0x56a6e3) .build(); Diethanolamine = new Material.Builder(15109, SuSyUtility.susyId('diethanolamine')) .liquid() - .components(Carbon, 4, Hydrogen, 11, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 11, Nitrogen * 1, Oxygen * 2) .color(0x4296d6) .build(); Triethanolamine = new Material.Builder(15110, SuSyUtility.susyId('triethanolamine')) .liquid() - .components(Carbon, 6, Hydrogen, 15, Nitrogen, 1, Oxygen, 3) + .components(Carbon * 6, Hydrogen * 15, Nitrogen * 1, Oxygen * 3) .color(0x2e86c9) .build(); EthyleneGlycol = new Material.Builder(15111, SuSyUtility.susyId('ethylene_glycol')) .liquid() - .components(Carbon, 2, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 2, Hydrogen * 6, Oxygen * 2) .color(0x2e86c9) .build(); EthyleneOxide = new Material.Builder(15112, SuSyUtility.susyId('ethylene_oxide')) .gas() - .components(Carbon, 2, Hydrogen, 4, Oxygen, 1) + .components(Carbon * 2, Hydrogen * 4, Oxygen * 1) .colorAverage() .build(); @@ -647,55 +647,55 @@ public class OrganicChemistryMaterials { Pentane = new Material.Builder(15115, SuSyUtility.susyId('pentane')) .liquid() - .components(Carbon, 5, Hydrogen, 12) + .components(Carbon * 5, Hydrogen * 12) .color(0xe8e7be) .build(); Hexane = new Material.Builder(15116, SuSyUtility.susyId('hexane')) .liquid() - .components(Carbon, 6, Hydrogen, 14) + .components(Carbon * 6, Hydrogen * 14) .color(0xcfceb6) .build(); Furfural = new Material.Builder(15117, SuSyUtility.susyId('furfural')) .liquid() - .components(Carbon, 5, Hydrogen, 4, Oxygen, 2) + .components(Carbon * 5, Hydrogen * 4, Oxygen * 2) .colorAverage() .build(); Cresol = new Material.Builder(15118, SuSyUtility.susyId('cresol')) .liquid() - .components(Carbon, 7, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 7, Hydrogen * 8, Oxygen * 1) .color(0x827863) .build(); Xylenol = new Material.Builder(15120, SuSyUtility.susyId('xylenol')) .liquid() - .components(Carbon, 8, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 10, Oxygen * 1) .color(0x693834) .build(); Creosol = new Material.Builder(15121, SuSyUtility.susyId('creosol')) .liquid() - .components(Carbon, 8, Hydrogen, 10, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 10, Oxygen * 2) .color(0x473339) .build(); Anthracene = new Material.Builder(15122, SuSyUtility.susyId('anthracene')) .dust() - .components(Carbon, 14, Hydrogen, 10) + .components(Carbon * 14, Hydrogen * 10) .color(0x000000) .build(); Triethylenediamine = new Material.Builder(15123, SuSyUtility.susyId('triethylenediamine')) .dust() - .components(Carbon, 6, Hydrogen, 12, Nitrogen, 2) + .components(Carbon * 6, Hydrogen * 12, Nitrogen * 2) .colorAverage() .build() Polyurethane = new Material.Builder(15124, SuSyUtility.susyId('polyurethane')) .dust() - .components(Carbon, 17, Hydrogen, 16, Nitrogen, 2, Oxygen, 4) + .components(Carbon * 17, Hydrogen * 16, Nitrogen * 2, Oxygen * 4) .color(0xd1d1d1) .flags(NO_UNIFICATION, GENERATE_PLATE, FORCE_GENERATE_BLOCK) .build() @@ -703,7 +703,7 @@ public class OrganicChemistryMaterials { DiethylEther = new Material.Builder(15125, SuSyUtility.susyId('diethyl_ether')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 1) .color(0x2177ff) .build() @@ -712,14 +712,14 @@ public class OrganicChemistryMaterials { Polypropylene = new Material.Builder(15126, SuSyUtility.susyId('polypropylene')) .polymer(1) .liquid(new FluidBuilder().temperature(444)) - .components(Carbon, 3, Hydrogen, 6) + .components(Carbon * 3, Hydrogen * 6) .color(0xdfe39a) .flags(GENERATE_FOIL) .build(); Dimethylformamide = new Material.Builder(15127, SuSyUtility.susyId('dimethylformamide')) .liquid() - .components(Carbon, 3, Hydrogen, 7, Nitrogen, 1) + .components(Carbon * 3, Hydrogen * 7, Nitrogen * 1) .colorAverage() .build() .setFormula('(CH3)2NCH', true); @@ -732,91 +732,91 @@ public class OrganicChemistryMaterials { TwoEthylanthraquinone = new Material.Builder(15129, SuSyUtility.susyId('two_ethylanthraquinone')) .liquid() - .components(Carbon, 16, Hydrogen, 12, Oxygen, 2) + .components(Carbon * 16, Hydrogen * 12, Oxygen * 2) .colorAverage() .build() TwoEthylanthrahydroquinone = new Material.Builder(15130, SuSyUtility.susyId('two_ethylanthrahydroquinone')) .liquid() - .components(Carbon, 16, Hydrogen, 14, Oxygen, 2) + .components(Carbon * 16, Hydrogen * 14, Oxygen * 2) .colorAverage() .build() Butanone = new Material.Builder(15131, SuSyUtility.susyId('butanone')) .liquid() - .components(Carbon, 4, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 8, Oxygen * 1) .colorAverage() .build() Durene = new Material.Builder(15132, SuSyUtility.susyId('durene')) .dust() - .components(Carbon, 10, Hydrogen, 14) + .components(Carbon * 10, Hydrogen * 14) .colorAverage() .build() PyromelliticDianhydride = new Material.Builder(15133, SuSyUtility.susyId('pyromellitic_dianhydride')) .dust() - .components(Carbon, 10, Hydrogen, 2, Oxygen, 6) + .components(Carbon * 10, Hydrogen * 2, Oxygen * 6) .colorAverage() .build() FourFourOxydianiline = new Material.Builder(15134, SuSyUtility.susyId('four_four_oxydianiline')) .dust() - .components(Carbon, 12, Hydrogen, 12, Nitrogen, 2, Oxygen, 1) + .components(Carbon * 12, Hydrogen * 12, Nitrogen * 2, Oxygen * 1) .colorAverage() .build() KaptonK = new Material.Builder(15135, SuSyUtility.susyId('kapton_k')) .polymer(1) - .components(Carbon, 22, Hydrogen, 10, Nitrogen, 2, Oxygen, 5) + .components(Carbon * 22, Hydrogen * 10, Nitrogen * 2, Oxygen * 5) .color(0xfabe19) .build() KaptonE = new Material.Builder(15136, SuSyUtility.susyId('kapton_e')) .polymer(1) - .components(Carbon, 22, Hydrogen, 10, Nitrogen, 2, Oxygen, 5) + .components(Carbon * 22, Hydrogen * 10, Nitrogen * 2, Oxygen * 5) .color(0xdcfa19) .build() TwoButanol = new Material.Builder(15137, SuSyUtility.susyId('two_butanol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 1) .colorAverage() .build() Acetamide = new Material.Builder(15138, SuSyUtility.susyId('acetamide')) .dust() - .components(Carbon, 2, Hydrogen, 5, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 2, Hydrogen * 5, Nitrogen * 1, Oxygen * 1) .colorAverage() .build() Hydrazine = new Material.Builder(15139, SuSyUtility.susyId('hydrazine')) .liquid() - .components(Nitrogen, 2, Hydrogen, 4) + .components(Nitrogen * 2, Hydrogen * 4) .colorAverage() .build() Ethylenediamine = new Material.Builder(15140, SuSyUtility.susyId('ethylenediamine')) .liquid() - .components(Carbon, 2, Hydrogen, 8, Nitrogen, 2) + .components(Carbon * 2, Hydrogen * 8, Nitrogen * 2) .colorAverage() .build() Pyrocatechol = new Material.Builder(15141, SuSyUtility.susyId('pyrocatechol')) .dust() - .components(Carbon, 6, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 6, Oxygen * 2) .colorAverage() .build() AcetoneCyanohydrin = new Material.Builder(15142, SuSyUtility.susyId('acetone_cyanohydrin')) .liquid() - .components(Carbon, 4, Hydrogen, 7, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 7, Nitrogen * 1, Oxygen * 1) .colorAverage() .build() MethylMethacrylate = new Material.Builder(15143, SuSyUtility.susyId('methyl_methacrylate')) .liquid() - .components(Carbon, 5, Hydrogen, 8, Oxygen, 2) + .components(Carbon * 5, Hydrogen * 8, Oxygen * 2) .colorAverage() .build() @@ -839,14 +839,14 @@ public class OrganicChemistryMaterials { EthylenediaminetetraaceticAcid = new Material.Builder(15147, SuSyUtility.susyId('ethylenediaminetetraacetic_acid')) .dust() - .components(Carbon, 10, Hydrogen, 16, Nitrogen, 2, Oxygen, 8) + .components(Carbon * 10, Hydrogen * 16, Nitrogen * 2, Oxygen * 8) .colorAverage() .build() .setFormula('(H4EDTA)', true) TetrasodiumEthylenediaminetetraacetate = new Material.Builder(15148, SuSyUtility.susyId('tetrasodium_ethylenediaminetetraacetate')) .dust() - .components(Carbon, 10, Hydrogen, 12, Nitrogen, 2, Sodium, 4, Oxygen, 8) + .components(Carbon * 10, Hydrogen * 12, Nitrogen * 2, Sodium * 4, Oxygen * 8) .colorAverage() .build() @@ -854,7 +854,7 @@ public class OrganicChemistryMaterials { Urea = new Material.Builder(15149, SuSyUtility.susyId('urea')) .dust() - .components(Carbon, 1, Oxygen, 1, Nitrogen, 2, Hydrogen, 4) + .components(Carbon * 1, Oxygen * 1, Nitrogen * 2, Hydrogen * 4) .colorAverage() .build() @@ -862,19 +862,19 @@ public class OrganicChemistryMaterials { Diiodobenzene = new Material.Builder(15150, SuSyUtility.susyId('diiodobenzene')) .dust() - .components(Carbon, 6, Hydrogen, 4, Iodine, 2) + .components(Carbon * 6, Hydrogen * 4, Iodine * 2) .colorAverage() .build() TerephthalicAcid = new Material.Builder(15151, SuSyUtility.susyId('terephthalic_acid')) .dust().liquid(new FluidBuilder().temperature(473)) - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0xadf0ce) .build() Bistrichloromethylbenzene = new Material.Builder(15152, SuSyUtility.susyId('bistrichloromethylbenzene')) .liquid() - .components(Carbon, 6, Hydrogen, 4, Carbon, 2, Chlorine, 6) + .components(Carbon * 6, Hydrogen * 4, Carbon * 2, Chlorine * 6) .colorAverage() .build() @@ -882,13 +882,13 @@ public class OrganicChemistryMaterials { TerephthaloylChloride = new Material.Builder(15153, SuSyUtility.susyId('terephthaloyl_chloride')) .dust() - .components(Carbon, 8, Hydrogen, 4, Chlorine, 2, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 4, Chlorine * 2, Oxygen * 2) .colorAverage() .build() Kevlar = new Material.Builder(15154, SuSyUtility.susyId('kevlar')) .color(0x4d443e) - .components(Carbon, 14, Hydrogen, 10, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 14, Hydrogen * 10, Nitrogen * 2, Oxygen * 2) .flags(GENERATE_PLATE) .build() @@ -897,12 +897,12 @@ public class OrganicChemistryMaterials { BiphenylTetracarboxylicAcidDianhydride = new Material.Builder(15155, SuSyUtility.susyId('biphenyl_tetracarboxylic_acid_dianhydride')) .dust() - .components(Carbon, 16, Hydrogen, 16, Oxygen, 6) + .components(Carbon * 16, Hydrogen * 16, Oxygen * 6) .colorAverage() .build() CelluloseAcetate = new Material.Builder(15157, SuSyUtility.susyId('cellulose_acetate')) - .components(Carbon, 76, Hydrogen, 114, Oxygen, 49) + .components(Carbon * 76, Hydrogen * 114, Oxygen * 49) .color(0xd4c9ab) .build() @@ -910,37 +910,37 @@ public class OrganicChemistryMaterials { Pyridine = new Material.Builder(15158, SuSyUtility.susyId('pyridine')) .liquid() - .components(Carbon, 5, Hydrogen, 5, Nitrogen, 1) + .components(Carbon * 5, Hydrogen * 5, Nitrogen * 1) .color(0x202836) .build() Quinoline = new Material.Builder(15159, SuSyUtility.susyId('quinoline')) .liquid() - .components(Carbon, 9, Hydrogen, 7, Nitrogen, 1) + .components(Carbon * 9, Hydrogen * 7, Nitrogen * 1) .color(0x2e3620) .build() DimethylCarbonate = new Material.Builder(15160, SuSyUtility.susyId('dimethyl_carbonate')) .liquid() - .components(Carbon, 3, Hydrogen, 6, Oxygen, 3) + .components(Carbon * 3, Hydrogen * 6, Oxygen * 3) .colorAverage() .build() DiethyleneGlycol = new Material.Builder(15161, SuSyUtility.susyId('diethylene_glycol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 3) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 3) .color(0x2ec9c1) .build() DiglycolicAcid = new Material.Builder(15162, SuSyUtility.susyId('diglycolic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 5) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 5) .colorAverage() .build() NOctanol = new Material.Builder(15163, SuSyUtility.susyId('n_octanol')) .liquid() - .components(Carbon, 8, Hydrogen, 18, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 18, Oxygen * 1) .color(0xbf8454) .build() @@ -948,37 +948,37 @@ public class OrganicChemistryMaterials { NOctylamine = new Material.Builder(15164, SuSyUtility.susyId('n_octylamine')) .liquid() - .components(Carbon, 8, Hydrogen, 19, Nitrogen, 1) + .components(Carbon * 8, Hydrogen * 19, Nitrogen * 1) .color(0xeb8634) .build() Dioctylamine = new Material.Builder(15165, SuSyUtility.susyId('dioctylamine')) .liquid() - .components(Carbon, 16, Hydrogen, 35, Nitrogen, 1) + .components(Carbon * 16, Hydrogen * 35, Nitrogen * 1) .colorAverage() .build() TetraoctylDiglycolamide = new Material.Builder(15166, SuSyUtility.susyId('tetraoctyl_diglycolamide')) .liquid() - .components(Carbon, 36, Hydrogen, 72, Nitrogen, 2, Oxygen, 3) + .components(Carbon * 36, Hydrogen * 72, Nitrogen * 2, Oxygen * 3) .colorAverage() .build() TwoEthylTwoHexenal = new Material.Builder(15167, SuSyUtility.susyId('two_ethyl_two_hexenal')) .liquid() - .components(Carbon, 8, Hydrogen, 14, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 14, Oxygen * 1) .colorAverage() .build() TwoEthylhexanol = new Material.Builder(15168, SuSyUtility.susyId('two_ethylhexanol')) .liquid() - .components(Carbon, 8, Hydrogen, 18, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 18, Oxygen * 1) .colorAverage() .build() DiTwoEthylhexylPhosphoricAcid = new Material.Builder(15169, SuSyUtility.susyId('di_two_ethylhexyl_phosphoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 16, Hydrogen, 35, Oxygen, 4, Phosphorus, 1) + .components(Carbon * 16, Hydrogen * 35, Oxygen * 4, Phosphorus * 1) .color(0xb5a677) .build() @@ -986,55 +986,55 @@ public class OrganicChemistryMaterials { LauricAcid = new Material.Builder(15170, SuSyUtility.susyId('lauric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 12, Hydrogen, 24, Oxygen, 2) + .components(Carbon * 12, Hydrogen * 24, Oxygen * 2) .color(0xe39c32) .build() CapricAcid = new Material.Builder(15171, SuSyUtility.susyId('capric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 10, Hydrogen, 20, Oxygen, 2) + .components(Carbon * 10, Hydrogen * 20, Oxygen * 2) .color(0xe3ba32) .build() PrimaryAmineN = new Material.Builder(15172, SuSyUtility.susyId('primary_amine_n')) .liquid() - .components(Carbon, 20, Hydrogen, 43, Nitrogen, 1) + .components(Carbon * 20, Hydrogen * 43, Nitrogen * 1) .color(0x8533e8) .build() NineOctadecene = new Material.Builder(15173, SuSyUtility.susyId('nine_octadecanone')) .liquid() - .components(Carbon, 18, Hydrogen, 36, Oxygen, 1) + .components(Carbon * 18, Hydrogen * 36, Oxygen * 1) .colorAverage() .build() TriOctylDecylAmine = new Material.Builder(15174, SuSyUtility.susyId('tri_octyl_decyl_amine')) .liquid() - .components(Carbon, 54, Hydrogen, 111, Nitrogen, 1) + .components(Carbon * 54, Hydrogen * 111, Nitrogen * 1) .color(0x6776c9) .build() Diethylbenzene = new Material.Builder(15175, SuSyUtility.susyId('diethylbenzene')) .liquid() - .components(Carbon, 10, Hydrogen, 14) + .components(Carbon * 10, Hydrogen * 14) .color(0xad9797) .build() Divinylbenzene = new Material.Builder(15176, SuSyUtility.susyId('divinylbenzene')) .liquid() - .components(Carbon, 10, Hydrogen, 10) + .components(Carbon * 10, Hydrogen * 10) .color(0xad9797) .build() NButanol = new Material.Builder(15177, SuSyUtility.susyId('n_butanol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 1) .colorAverage() .build() DibutylCarbitol = new Material.Builder(15178, SuSyUtility.susyId('dibutyl_carbitol')) .liquid() - .components(Carbon, 12, Hydrogen, 26, Oxygen, 3) + .components(Carbon * 12, Hydrogen * 26, Oxygen * 3) .color(0x89db6b) .build() @@ -1042,7 +1042,7 @@ public class OrganicChemistryMaterials { MonoTwoEthylhexylPhosphoricAcid = new Material.Builder(15179, SuSyUtility.susyId('mono_two_ethylhexyl_phosphoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 16, Hydrogen, 34, Oxygen, 3, Phosphorus, 1) + .components(Carbon * 16, Hydrogen * 34, Oxygen * 3, Phosphorus * 1) .color(0xb5a677) .build() @@ -1050,19 +1050,19 @@ public class OrganicChemistryMaterials { MethylIsobutylKetone = new Material.Builder(15180, SuSyUtility.susyId('methyl_isobutyl_ketone')) .liquid() - .components(Carbon, 6, Hydrogen, 12, Oxygen, 1) + .components(Carbon * 6, Hydrogen * 12, Oxygen * 1) .color(0x86dbb1) .build() MethylIsobutylCarbinol = new Material.Builder(15181, SuSyUtility.susyId('methyl_isobutyl_carbinol')) .liquid() - .components(Carbon, 6, Hydrogen, 14, Oxygen, 1) + .components(Carbon * 6, Hydrogen * 14, Oxygen * 1) .color(0x79c4c7) .build() NHexanol = new Material.Builder(15182, SuSyUtility.susyId('n_hexanol')) .liquid() - .components(Carbon, 6, Hydrogen, 14, Oxygen, 1) + .components(Carbon * 6, Hydrogen * 14, Oxygen * 1) .color(0xff9640) .build(); @@ -1070,7 +1070,7 @@ public class OrganicChemistryMaterials { NDecanol = new Material.Builder(15183, SuSyUtility.susyId('n_decanol')) .liquid() - .components(Carbon, 10, Hydrogen, 22, Oxygen, 1) + .components(Carbon * 10, Hydrogen * 22, Oxygen * 1) .color(0xdb8035) .build(); @@ -1078,7 +1078,7 @@ public class OrganicChemistryMaterials { NDodecanol = new Material.Builder(15184, SuSyUtility.susyId('n_dodecanol')) .liquid(new FluidBuilder().temperature(293)) - .components(Carbon, 12, Hydrogen, 26, Oxygen, 1) + .components(Carbon * 12, Hydrogen * 26, Oxygen * 1) .color(0xbd6e2d) .build(); @@ -1086,7 +1086,7 @@ public class OrganicChemistryMaterials { NTetradecanol = new Material.Builder(15185, SuSyUtility.susyId('n_tetradecanol')) .liquid(new FluidBuilder().temperature(311)) - .components(Carbon, 14, Hydrogen, 30, Oxygen, 1) + .components(Carbon * 14, Hydrogen * 30, Oxygen * 1) .color(0x2177ff) .build(); @@ -1094,7 +1094,7 @@ public class OrganicChemistryMaterials { NHexadecanol = new Material.Builder(15186, SuSyUtility.susyId('n_hexadecanol')) .liquid(new FluidBuilder().temperature(323)) - .components(Carbon, 16, Hydrogen, 34, Oxygen, 1) + .components(Carbon * 16, Hydrogen * 34, Oxygen * 1) .color(0x824b1e) .build(); @@ -1102,43 +1102,43 @@ public class OrganicChemistryMaterials { OleicAcid = new Material.Builder(15187, SuSyUtility.susyId('oleic_acid')) .dust().liquid() - .components(Carbon, 18, Hydrogen, 34, Oxygen, 2) + .components(Carbon * 18, Hydrogen * 34, Oxygen * 2) .color(0xb1d1ae) .build() LinoleicAcid = new Material.Builder(15188, SuSyUtility.susyId('linoleic_acid')) .dust().liquid() - .components(Carbon, 18, Hydrogen, 32, Oxygen, 2) + .components(Carbon * 18, Hydrogen * 32, Oxygen * 2) .color(0xbfd1a3) .build() PalmiticAcid = new Material.Builder(15189, SuSyUtility.susyId('palmitic_acid')) .dust().liquid() - .components(Carbon, 16, Hydrogen, 32, Oxygen, 2) + .components(Carbon * 16, Hydrogen * 32, Oxygen * 2) .color(0xd4d392) .build() Capsaicin = new Material.Builder(15190, SuSyUtility.susyId('capsaicin')) .dust() - .components(Carbon, 18, Hydrogen, 27, Nitrogen, 1, Oxygen, 3) + .components(Carbon * 18, Hydrogen * 27, Nitrogen * 1, Oxygen * 3) .color(0xff1900) .build(); Diisopropylamine = new Material.Builder(15191, SuSyUtility.susyId('diisopropylamine')) .liquid() - .components(Carbon, 6, Hydrogen, 15, Nitrogen, 1) + .components(Carbon * 6, Hydrogen * 15, Nitrogen * 1) .colorAverage() .build(); Diisopropylaminoethanol = new Material.Builder(15192, SuSyUtility.susyId('diisopropylaminoethanol')) .liquid() - .components(Carbon, 8, Hydrogen, 19, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 19, Nitrogen * 1, Oxygen * 1) .colorAverage() .build(); IsopropylAlcohol = new Material.Builder(15193, SuSyUtility.susyId('isopropyl_alcohol')) .liquid() - .components(Carbon, 3, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 3, Hydrogen * 8, Oxygen * 1) .colorAverage() .build(); @@ -1146,43 +1146,43 @@ public class OrganicChemistryMaterials { Triethylamine = new Material.Builder(15194, SuSyUtility.susyId('triethylamine')) .liquid() - .components(Carbon, 6, Hydrogen, 15, Nitrogen, 1) + .components(Carbon * 6, Hydrogen * 15, Nitrogen * 1) .color(0xe07d26) .build(); Diethylamine = new Material.Builder(15195, SuSyUtility.susyId('diethylamine')) .liquid() - .components(Carbon, 4, Hydrogen, 11, Nitrogen, 1) + .components(Carbon * 4, Hydrogen * 11, Nitrogen * 1) .color(0xf59542) .build(); Ethylamine = new Material.Builder(15196, SuSyUtility.susyId('ethylamine')) .liquid() - .components(Carbon, 2, Hydrogen, 7, Nitrogen, 1) + .components(Carbon * 2, Hydrogen * 7, Nitrogen * 1) .color(0xf5a55f) .build(); Diethylacetamide = new Material.Builder(15197, SuSyUtility.susyId('diethylacetamide')) .liquid() - .components(Carbon, 6, Hydrogen, 13, Oxygen, 1, Nitrogen, 1) + .components(Carbon * 6, Hydrogen * 13, Oxygen * 1, Nitrogen * 1) .colorAverage() .build(); Diethylacetimidamine = new Material.Builder(15198, SuSyUtility.susyId('diethylacetimidamine')) .liquid() - .components(Carbon, 6, Hydrogen, 14, Nitrogen, 2) + .components(Carbon * 6, Hydrogen * 14, Nitrogen * 2) .colorAverage() .build(); Novichok = new Material.Builder(15199, SuSyUtility.susyId('novichok')) .liquid() - .components(Carbon, 7, Hydrogen, 16, Fluorine, 1, Nitrogen, 2, Oxygen, 1, Phosphorus, 1) + .components(Carbon * 7, Hydrogen * 16, Fluorine * 1, Nitrogen * 2, Oxygen * 1, Phosphorus * 1) .colorAverage() .build(); IsoamylAlcohol = new Material.Builder(15200, SuSyUtility.susyId('isoamyl_alcohol')) .liquid() - .components(Carbon, 5, Hydrogen, 12, Oxygen, 1) + .components(Carbon * 5, Hydrogen * 12, Oxygen * 1) .color(0x23ad13) .build(); @@ -1190,7 +1190,7 @@ public class OrganicChemistryMaterials { IsobutylAlcohol = new Material.Builder(15201, SuSyUtility.susyId('isobutyl_alcohol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 1) .color(0xa0ad13) .build(); @@ -1198,49 +1198,49 @@ public class OrganicChemistryMaterials { CaprylicAcid = new Material.Builder(15202, SuSyUtility.susyId('caprylic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 8, Hydrogen, 16, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 16, Oxygen * 2) .color(0x748545) .build(); OctanoylChloride = new Material.Builder(15203, SuSyUtility.susyId('octanoyl_chloride')) .liquid() - .components(Carbon, 8, Hydrogen, 15, Chlorine, 1, Oxygen, 1) + .components(Carbon * 8, Hydrogen * 15, Chlorine * 1, Oxygen * 1) .color(0x458548) .build(); PerfluorooctanoylFluoride = new Material.Builder(15204, SuSyUtility.susyId('perfluorooctanoyl_fluoride')) .liquid() - .components(Carbon, 8, Fluorine, 16, Oxygen, 1) + .components(Carbon * 8, Fluorine * 16, Oxygen * 1) .color(0x288a7b) .build(); PerfluorooctanoicAcid = new Material.Builder(15205, SuSyUtility.susyId('perfluorooctanoic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 1, Fluorine, 15, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 1, Fluorine * 15, Oxygen * 2) .color(0x24bfa8) .build(); OneButene = new Material.Builder(15206, SuSyUtility.susyId('one_butene')) .gas() - .components(Carbon, 4, Hydrogen, 8) + .components(Carbon * 4, Hydrogen * 8) .color(0xed9595) .build(); TwoButene = new Material.Builder(15207, SuSyUtility.susyId('two_butene')) .gas() - .components(Carbon, 4, Hydrogen, 8) + .components(Carbon * 4, Hydrogen * 8) .color(0xab6009) .build(); NPentanol = new Material.Builder(15208, SuSyUtility.susyId('n_pentanol')) .liquid() - .components(Carbon, 5, Hydrogen, 12, Oxygen, 1) + .components(Carbon * 5, Hydrogen * 12, Oxygen * 1) .color(0xb37834) .build(); SodiumEthoxideSolution = new Material.Builder(15209, SuSyUtility.susyId('sodium_ethoxide_solution')) .liquid() - .components(Carbon, 2, Hydrogen, 5, Oxygen, 1, Sodium, 1, Ethanol, 1) + .components(Carbon * 2, Hydrogen * 5, Oxygen * 1, Sodium * 1, Ethanol * 1) .color(0xcc5050) .build(); @@ -1248,7 +1248,7 @@ public class OrganicChemistryMaterials { SodiumEthylXanthate = new Material.Builder(15210, SuSyUtility.susyId('sodium_ethyl_xanthate')) .dust() - .components(Carbon, 3, Hydrogen, 5, Oxygen, 1, Sulfur, 2, Sodium, 1) + .components(Carbon * 3, Hydrogen * 5, Oxygen * 1, Sulfur * 2, Sodium * 1) .color(0xfdffbf) .build(); @@ -1256,7 +1256,7 @@ public class OrganicChemistryMaterials { PotassiumAmylXanthate = new Material.Builder(15211, SuSyUtility.susyId('potassium_amyl_xanthate')) .dust() - .components(Carbon, 6, Hydrogen, 11, Oxygen, 1, Sulfur, 2, Potassium, 1) + .components(Carbon * 6, Hydrogen * 11, Oxygen * 1, Sulfur * 2, Potassium * 1) .color(0xe0d582) .build(); @@ -1264,13 +1264,13 @@ public class OrganicChemistryMaterials { Isobutyraldehyde = new Material.Builder(15212, SuSyUtility.susyId('isobutyraldehyde')) .liquid() - .components(Carbon, 4, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 8, Oxygen * 1) .color(0x9ccf69) .build(); SodiumIsobutylXanthate = new Material.Builder(15213, SuSyUtility.susyId('sodium_isobutyl_xanthate')) .dust() - .components(Carbon, 5, Hydrogen, 9, Oxygen, 1, Sulfur, 2, Sodium, 1) + .components(Carbon * 5, Hydrogen * 9, Oxygen * 1, Sulfur * 2, Sodium * 1) .color(0xb1bf60) .build(); @@ -1278,7 +1278,7 @@ public class OrganicChemistryMaterials { PotassiumIsopropylXanthate = new Material.Builder(15214, SuSyUtility.susyId('potassium_isopropyl_xanthate')) .dust() - .components(Carbon, 4, Hydrogen, 7, Oxygen, 1, Sulfur, 2, Potassium, 1) + .components(Carbon * 4, Hydrogen * 7, Oxygen * 1, Sulfur * 2, Potassium * 1) .color(0xcbdb6b) .build(); @@ -1286,7 +1286,7 @@ public class OrganicChemistryMaterials { PotassiumEthylXanthate = new Material.Builder(15215, SuSyUtility.susyId('potassium_ethyl_xanthate')) .dust() - .components(Carbon, 3, Hydrogen, 5, Oxygen, 1, Sulfur, 2, Potassium, 1) + .components(Carbon * 3, Hydrogen * 5, Oxygen * 1, Sulfur * 2, Potassium * 1) .color(0xfdffc8) .build(); @@ -1294,19 +1294,19 @@ public class OrganicChemistryMaterials { Valeraldehyde = new Material.Builder(15216, SuSyUtility.susyId('valeraldehyde')) .liquid() - .components(Carbon, 5, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 5, Hydrogen * 10, Oxygen * 1) .color(0xb3af34) .build(); NHexadecylamine = new Material.Builder(15217, SuSyUtility.susyId('n_hexadecylamine')) .dust() - .components(Carbon, 16, Hydrogen, 35, Nitrogen, 1) + .components(Carbon * 16, Hydrogen * 35, Nitrogen * 1) .color(0xcff5ff) .build(); TertButylAlcohol = new Material.Builder(15218, SuSyUtility.susyId('tert_butyl_alcohol')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 1) .colorAverage() .build(); @@ -1314,7 +1314,7 @@ public class OrganicChemistryMaterials { ButylatedHydroxytoluene = new Material.Builder(15219, SuSyUtility.susyId('butylated_hydroxytoluene')) .liquid() - .components(Carbon, 15, Hydrogen, 25, Oxygen, 1) + .components(Carbon * 15, Hydrogen * 25, Oxygen * 1) .colorAverage() .build(); @@ -1322,7 +1322,7 @@ public class OrganicChemistryMaterials { DimethylTertButylphenol = new Material.Builder(15220, SuSyUtility.susyId('dimethyl_tert_butylphenol')) .liquid() - .components(Carbon, 12, Hydrogen, 18, Oxygen, 1) + .components(Carbon * 12, Hydrogen * 18, Oxygen * 1) .colorAverage() .build(); @@ -1330,7 +1330,7 @@ public class OrganicChemistryMaterials { AluminiumPhenolate = new Material.Builder(15221, SuSyUtility.susyId('aluminium_phenolate')) .dust() - .components(Carbon, 18, Hydrogen, 15, Aluminium, 1, Oxygen, 3) + .components(Carbon * 18, Hydrogen * 15, Aluminium * 1, Oxygen * 3) .colorAverage() .build(); @@ -1338,7 +1338,7 @@ public class OrganicChemistryMaterials { DiTertButylphenol = new Material.Builder(15222, SuSyUtility.susyId('di_tert_butylphenol')) .liquid() - .components(Carbon, 14, Hydrogen, 22, Oxygen, 1) + .components(Carbon * 14, Hydrogen * 22, Oxygen * 1) .colorAverage() .build(); @@ -1346,7 +1346,7 @@ public class OrganicChemistryMaterials { IsoOctane = new Material.Builder(15223, SuSyUtility.susyId('isooctane')) .liquid() - .components(Carbon, 8, Hydrogen, 18) + .components(Carbon * 8, Hydrogen * 18) .colorAverage() .build(); @@ -1354,13 +1354,13 @@ public class OrganicChemistryMaterials { PurifiedIsoprene = new Material.Builder(15224, SuSyUtility.susyId('purified_isoprene')) .liquid() - .components(Carbon, 5, Hydrogen, 8) + .components(Carbon * 5, Hydrogen * 8) .color(0x000000) .build(); Cyclopentadiene = new Material.Builder(15225, SuSyUtility.susyId('cyclopentadiene')) .liquid() - .components(Carbon, 5, Hydrogen, 6) + .components(Carbon * 5, Hydrogen * 6) .color(0x403c32) .build(); @@ -1368,7 +1368,7 @@ public class OrganicChemistryMaterials { Ferrocene = new Material.Builder(15227, SuSyUtility.susyId('ferrocene')) .dust() - .components(Carbon, 10, Hydrogen, 10, Iron, 1) + .components(Carbon * 10, Hydrogen * 10, Iron * 1) .color(0x403c32) .build(); @@ -1377,25 +1377,25 @@ public class OrganicChemistryMaterials { Polyisoprene = new Material.Builder(15228, SuSyUtility.susyId('polyisoprene')) .dust() .iconSet(SHINY) - .components(Carbon, 5, Hydrogen, 8) + .components(Carbon * 5, Hydrogen * 8) .color(0x1f1f1f) .build(); Chloroethane = new Material.Builder(15229, SuSyUtility.susyId('chloroethane')) .gas() - .components(Carbon, 2, Hydrogen, 5, Chlorine, 1) + .components(Carbon * 2, Hydrogen * 5, Chlorine * 1) .colorAverage() .build(); ExtractedCaprolactamSolution = new Material.Builder(15230, SuSyUtility.susyId('extracted_caprolactam_solution')) .liquid() - .components(Caprolactam, 1, Toluene, 1) + .components(Caprolactam * 1, Toluene * 1) .colorAverage() .build(); Trimethylaluminium = new Material.Builder(15231, SuSyUtility.susyId('trimethylaluminium')) .liquid() - .components(Aluminium, 1, Carbon, 3, Hydrogen, 9) + .components(Aluminium * 1, Carbon * 3, Hydrogen * 9) .color(0x7abfb4) .build(); @@ -1403,13 +1403,13 @@ public class OrganicChemistryMaterials { Methylaluminoxane = new Material.Builder(15232, SuSyUtility.susyId('methylaluminoxane')) .dust() - .components(Aluminium, 1, Carbon, 1, Hydrogen, 3, Oxygen, 1) + .components(Aluminium * 1, Carbon * 1, Hydrogen * 3, Oxygen * 1) .color(0x33a391) .build(); ZirconoceneDichloride = new Material.Builder(15233, SuSyUtility.susyId('zirconocene_dichloride')) .dust() - .components(Zirconium, 1, Carbon, 10, Hydrogen, 10, Chlorine, 2) + .components(Zirconium * 1, Carbon * 10, Hydrogen * 10, Chlorine * 2) .color(0x3ea0a3) .build(); @@ -1417,7 +1417,7 @@ public class OrganicChemistryMaterials { Tetrahydrofuran = new Material.Builder(15234, SuSyUtility.susyId('tetrahydrofuran')) .liquid() - .components(Carbon, 4, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 8, Oxygen * 1) .color(0xd13485) .build(); @@ -1425,19 +1425,19 @@ public class OrganicChemistryMaterials { OctylHydroxamicAcid = new Material.Builder(15236, SuSyUtility.susyId('octyl_hydroxamic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 17, Oxygen, 2, Nitrogen, 1) + .components(Carbon * 8, Hydrogen * 17, Oxygen * 2, Nitrogen * 1) .color(0xd47f31) .build(); PotassiumOctylHydroxamate = new Material.Builder(15237, SuSyUtility.susyId('potassium_octyl_hydroxamate')) .dust() - .components(Carbon, 8, Hydrogen, 16, Oxygen, 2, Nitrogen, 1, Potassium, 1) + .components(Carbon * 8, Hydrogen * 16, Oxygen * 2, Nitrogen * 1, Potassium * 1) .color(0xd47f50) .build(); PotassiumButylXanthate = new Material.Builder(15238, SuSyUtility.susyId('potassium_butyl_xanthate')) .dust() - .components(Carbon, 5, Hydrogen, 9, Oxygen, 1, Sulfur, 2, Potassium, 1) + .components(Carbon * 5, Hydrogen * 9, Oxygen * 1, Sulfur * 2, Potassium * 1) .color(0xd1c675) .build(); @@ -1445,110 +1445,110 @@ public class OrganicChemistryMaterials { PicricAcid = new Material.Builder(15239, SuSyUtility.susyId('picric_acid')) .dust() - .components(Carbon, 6, Hydrogen, 3, Nitrogen, 3, Oxygen, 7) + .components(Carbon * 6, Hydrogen * 3, Nitrogen * 3, Oxygen * 7) .color(0xc2ba1f) .build(); Monomethylhydrazine = new Material.Builder(15240, SuSyUtility.susyId('monomethylhydrazine')) .liquid() - .components(Carbon, 1, Hydrogen, 6, Nitrogen, 2) + .components(Carbon * 1, Hydrogen * 6, Nitrogen * 2) .color(0x558ca6) .build(); OrthoXylene = new Material.Builder(15241, SuSyUtility.susyId('ortho_xylene')) .liquid() - .components(Carbon, 8, Hydrogen, 10) + .components(Carbon * 8, Hydrogen * 10) .color(0x3d3427) .build(); MetaXylene = new Material.Builder(15242, SuSyUtility.susyId('meta_xylene')) .liquid() - .components(Carbon, 8, Hydrogen, 10) + .components(Carbon * 8, Hydrogen * 10) .color(0x40392f) .build(); ParaXylene = new Material.Builder(15243, SuSyUtility.susyId('para_xylene')) .dust().liquid() .flags(NO_UNIFICATION) - .components(Carbon, 8, Hydrogen, 10) + .components(Carbon * 8, Hydrogen * 10) .color(0x1a1611) .build(); MetaParaXyleneMixture = new Material.Builder(15244, SuSyUtility.susyId('meta_para_xylene_mixture')) .liquid() - .components(Carbon, 8, Hydrogen, 10) + .components(Carbon * 8, Hydrogen * 10) .color(0x2b2319) .build(); Tripropylamine = new Material.Builder(15245, SuSyUtility.susyId('tripropylamine')) .liquid() - .components(Carbon, 9, Hydrogen, 21, Nitrogen, 1) + .components(Carbon * 9, Hydrogen * 21, Nitrogen * 1) .color(0x90b846) .build(); NBromopropane = new Material.Builder(15246, SuSyUtility.susyId('n_bromopropane')) .liquid() - .components(Carbon, 3, Hydrogen, 7, Bromine, 1) + .components(Carbon * 3, Hydrogen * 7, Bromine * 1) .color(0x9e833f) .build(); Triethylenetetramine = new Material.Builder(15247, SuSyUtility.susyId('triethylenetetramine')) .liquid() - .components(Carbon, 6, Hydrogen, 18, Nitrogen, 4) + .components(Carbon * 6, Hydrogen * 18, Nitrogen * 4) .color(0x3d98ab) .build(); Aminoethylpiperazine = new Material.Builder(15248, SuSyUtility.susyId('aminoethylpiperazine')) .liquid() - .components(Carbon, 6, Hydrogen, 15, Nitrogen, 3) + .components(Carbon * 6, Hydrogen * 15, Nitrogen * 3) .color(0xcce862) .build(); Diethylenetriamine = new Material.Builder(15249, SuSyUtility.susyId('diethylenetriamine')) .liquid() - .components(Carbon, 4, Hydrogen, 13, Nitrogen, 3) + .components(Carbon * 4, Hydrogen * 13, Nitrogen * 3) .color(0x0234a8) .build(); Ethylenediamine = new Material.Builder(15250, SuSyUtility.susyId('ethylenediamine')) .liquid() - .components(Carbon, 2, Hydrogen, 8, Nitrogen, 2) + .components(Carbon * 2, Hydrogen * 8, Nitrogen * 2) .color(0x2e7a25) .build(); Piperazine = new Material.Builder(15251, SuSyUtility.susyId('piperazine')) .liquid(new FluidBuilder().temperature(379)) - .components(Carbon, 4, Hydrogen, 10, Nitrogen, 2) + .components(Carbon * 4, Hydrogen * 10, Nitrogen * 2) .color(0x8a8f9f) .build(); Cyclooctadiene = new Material.Builder(15253, SuSyUtility.susyId('cyclooctadiene')) .liquid() - .components(Carbon, 8, Hydrogen, 12) + .components(Carbon * 8, Hydrogen * 12) .color(0x4639ee) .build(); TriethylPhosphate = new Material.Builder(15254, SuSyUtility.susyId('triethyl_phosphate')) .liquid() - .components(Carbon, 6, Hydrogen, 15, Oxygen, 4, Phosphorus, 1) + .components(Carbon * 6, Hydrogen * 15, Oxygen * 4, Phosphorus * 1) .color(0x4639ee) .build(); IsopropenylAcetate = new Material.Builder(15255, SuSyUtility.susyId('isopropenyl_acetate')) .liquid() - .components(Carbon, 5, Hydrogen, 8, Oxygen, 2) + .components(Carbon * 5, Hydrogen * 8, Oxygen * 2) .color(0x4639ee) .build(); Acetylacetone = new Material.Builder(15256, SuSyUtility.susyId('acetylacetone')) .liquid() - .components(Carbon, 5, Hydrogen, 8, Oxygen, 2) + .components(Carbon * 5, Hydrogen * 8, Oxygen * 2) .color(0x092b30) .build(); NickelIIBisacetylacetonate = new Material.Builder(15257, SuSyUtility.susyId('nickel_ii_bisacetylacetonate')) .dust() - .components(Carbon, 10, Hydrogen, 14, Nickel, 1, Oxygen, 4) + .components(Carbon * 10, Hydrogen * 14, Nickel * 1, Oxygen * 4) .color(0x3e5051) .build(); @@ -1556,7 +1556,7 @@ public class OrganicChemistryMaterials { BiscyclooctadienenickelZero = new Material.Builder(15258, SuSyUtility.susyId('biscyclooctadienenickel_zero')) .dust() - .components(Carbon, 16, Hydrogen, 24, Nickel, 1) + .components(Carbon * 16, Hydrogen * 24, Nickel * 1) .color(0xe0e00d) .build(); @@ -1564,7 +1564,7 @@ public class OrganicChemistryMaterials { DiethylaluminiumAcetylacetonate = new Material.Builder(15259, SuSyUtility.susyId('diethylaluminium_acetylacetonate')) .liquid() - .components(Aluminium, 1, Carbon, 9, Hydrogen, 17, Oxygen, 2) + .components(Aluminium * 1, Carbon * 9, Hydrogen * 17, Oxygen * 2) .color(0x10a37e) .build(); @@ -1572,7 +1572,7 @@ public class OrganicChemistryMaterials { OxalicAcid = new Material.Builder(15260, SuSyUtility.susyId('oxalic_acid')) .dust() - .components(Hydrogen, 2, Carbon, 2, Oxygen, 4) + .components(Hydrogen * 2, Carbon * 2, Oxygen * 4) .color(0xb5a7aa) .build(); @@ -1583,140 +1583,140 @@ public class OrganicChemistryMaterials { Chlorodiphenylphosphine = new Material.Builder(15262, SuSyUtility.susyId('chlorodiphenylphosphine')) .liquid() - .components(Carbon, 12, Hydrogen, 10, Chlorine, 1, Phosphorus, 1) + .components(Carbon * 12, Hydrogen * 10, Chlorine * 1, Phosphorus * 1) .color(0xd2e080) .build(); DiphenylphosphinoaceticAcid = new Material.Builder(15263, SuSyUtility.susyId('diphenylphosphinoacetic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 14, Hydrogen, 13, Oxygen, 2, Phosphorus, 1) + .components(Carbon * 14, Hydrogen * 13, Oxygen * 2, Phosphorus * 1) .color(0xdeba6d) .build(); OneHexene = new Material.Builder(15264, SuSyUtility.susyId('one_hexene')) .liquid() - .components(Carbon, 6, Hydrogen, 12) + .components(Carbon * 6, Hydrogen * 12) .color(0xd96c6c) .build(); Tripropylene = new Material.Builder(15265, SuSyUtility.susyId('tripropylene')) .liquid() - .components(Carbon, 9, Hydrogen, 18) + .components(Carbon * 9, Hydrogen * 18) .color(0xcf5f1f) .build(); Isodecanal = new Material.Builder(15266, SuSyUtility.susyId('isodecanal')) .liquid() - .components(Carbon, 10, Hydrogen, 20, Oxygen, 1) + .components(Carbon * 10, Hydrogen * 20, Oxygen * 1) .color(0xde8431) .build(); Isodecanol = new Material.Builder(15267, SuSyUtility.susyId('isodecanol')) .liquid() - .components(Carbon, 10, Hydrogen, 22, Oxygen, 1) + .components(Carbon * 10, Hydrogen * 22, Oxygen * 1) .color(0xeb9546) .build(); Trioctylamine = new Material.Builder(15268, SuSyUtility.susyId('trioctylamine')) .liquid() - .components(Carbon, 24, Hydrogen, 51, Nitrogen, 1) + .components(Carbon * 24, Hydrogen * 51, Nitrogen * 1) .color(0x2274a3) .build(); NButylamine = new Material.Builder(15269, SuSyUtility.susyId('n_butylamine')) .liquid() - .components(Carbon, 4, Hydrogen, 11, Nitrogen, 1) + .components(Carbon * 4, Hydrogen * 11, Nitrogen * 1) .color(0x43576e) .build(); Ethyltoluene = new Material.Builder(15270, SuSyUtility.susyId('ethyltoluene')) .liquid() - .components(Carbon, 9, Hydrogen, 12) + .components(Carbon * 9, Hydrogen * 12) .color(0x806706) .build(); VinylbenzylChloride = new Material.Builder(15271, SuSyUtility.susyId('vinylbenzyl_chloride')) .liquid() - .components(Carbon, 9, Hydrogen, 9, Chlorine, 1) + .components(Carbon * 9, Hydrogen * 9, Chlorine * 1) .color(0x8fa32a) .build(); TetrabromobisphenolA = new Material.Builder(15272, SuSyUtility.susyId('tetrabromobisphenol_a')) .dust() - .components(Carbon, 15, Hydrogen, 12, Bromine, 4, Oxygen, 2) + .components(Carbon * 15, Hydrogen * 12, Bromine * 4, Oxygen * 2) .color(0x6b3220) .build(); Cyanamide = new Material.Builder(15273, SuSyUtility.susyId('cyanamide')) .dust() - .components(Carbon, 1, Hydrogen, 2, Nitrogen, 2) + .components(Carbon * 1, Hydrogen * 2, Nitrogen * 2) .colorAverage() .build(); Dicyandiamide = new Material.Builder(15274, SuSyUtility.susyId('dicyandiamide')) .dust() - .components(Carbon, 2, Hydrogen, 4, Nitrogen, 4) + .components(Carbon * 2, Hydrogen * 4, Nitrogen * 4) .colorAverage() .iconSet(QUARTZ) .build(); TwoMethylimidazole = new Material.Builder(15275, SuSyUtility.susyId('two_methylimidazole')) .dust() - .components(Carbon, 4, Hydrogen, 6, Nitrogen, 2) + .components(Carbon * 4, Hydrogen * 6, Nitrogen * 2) .colorAverage() .build(); FlameRetardantEpoxy = new Material.Builder(15276, SuSyUtility.susyId('flame_retardant_epoxy')) .dust().liquid() - .components(Carbon, 21, Hydrogen, 21, Bromine, 4, Chlorine, 1, Oxygen, 5) + .components(Carbon * 21, Hydrogen * 21, Bromine * 4, Chlorine * 1, Oxygen * 5) .color(0xc86b14) .build(); PropyleneChlorohydrin = new Material.Builder(15277, SuSyUtility.susyId('propylene_chlorohydrin')) .liquid() - .components(Carbon, 3, Hydrogen, 7, Chlorine, 1, Oxygen, 1) + .components(Carbon * 3, Hydrogen * 7, Chlorine * 1, Oxygen * 1) .colorAverage() .build(); PropyleneOxide = new Material.Builder(15278, SuSyUtility.susyId('propylene_oxide')) .liquid() - .components(Carbon, 3, Hydrogen, 6, Oxygen, 1) + .components(Carbon * 3, Hydrogen * 6, Oxygen * 1) .color(0x9ab522) .build(); PropyleneCarbonate = new Material.Builder(15279, SuSyUtility.susyId('propylene_carbonate')) .liquid() - .components(Carbon, 4, Hydrogen, 6, Oxygen, 3) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 3) .color(0x5db522) .build(); DiphenylSulfide = new Material.Builder(15280, SuSyUtility.susyId('diphenyl_sulfide')) .dust() - .components(Carbon, 12, Hydrogen, 10, Sulfur, 1) + .components(Carbon * 12, Hydrogen * 10, Sulfur * 1) .color(0x5e5c0a) .build(); DiphenylSulfoxide = new Material.Builder(15281, SuSyUtility.susyId('diphenyl_sulfoxide')) .dust() - .components(Carbon, 12, Hydrogen, 10, Oxygen, 1, Sulfur, 1) + .components(Carbon * 12, Hydrogen * 10, Oxygen * 1, Sulfur * 1) .color(0x435e0a) .build(); MethanesulfonicAcid = new Material.Builder(15282, SuSyUtility.susyId('methanesulfonic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 1, Hydrogen, 4, Oxygen, 3, Sulfur, 1) + .components(Carbon * 1, Hydrogen * 4, Oxygen * 3, Sulfur * 1) .color(0xff6e6e) .build(); TriphenylphosphineOxide = new Material.Builder(15283, SuSyUtility.susyId('triphenylphosphine_oxide')) .dust() - .components(Carbon, 18, Hydrogen, 15, Oxygen, 1, Phosphorus, 1) + .components(Carbon * 18, Hydrogen * 15, Oxygen * 1, Phosphorus * 1) .colorAverage() .build(); TosylicAcidSolution = new Material.Builder(15284, SuSyUtility.susyId("tosylic_acid_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 7, Hydrogen, 8, Oxygen, 3, Sulfur, 1, Water, 1) + .components(Carbon * 7, Hydrogen * 8, Oxygen * 3, Sulfur * 1, Water * 1) .colorAverage() .build(); @@ -1724,32 +1724,32 @@ public class OrganicChemistryMaterials { Triphenylphosphine = new Material.Builder(15285, SuSyUtility.susyId('triphenylphosphine')) .dust() - .components(Carbon, 18, Hydrogen, 15, Phosphorus, 1) + .components(Carbon * 18, Hydrogen * 15, Phosphorus * 1) .colorAverage() .build(); TriphenylphosphineDichloride = new Material.Builder(15286, SuSyUtility.susyId('triphenylphosphine_dichloride')) .dust() - .components(Carbon, 18, Hydrogen, 15, Chlorine, 2, Phosphorus, 1) + .components(Carbon * 18, Hydrogen * 15, Chlorine * 2, Phosphorus * 1) .colorAverage() .build(); BistriphenylphosphineiminiumChloride = new Material.Builder(15287, SuSyUtility.susyId('bistriphenylphosphineiminium_chloride')) .dust() - .components(Carbon, 36, Hydrogen, 30, Chlorine, 1, Nitrogen, 1, Phosphorus, 2) + .components(Carbon * 36, Hydrogen * 30, Chlorine * 1, Nitrogen * 1, Phosphorus * 2) .colorAverage() .build(); DimethylTerephthalate = new Material.Builder(15288, SuSyUtility.susyId('dimethyl_terephthalate')) .dust().liquid(new FluidBuilder().temperature(533)) - .components(Carbon, 10, Hydrogen, 10, Oxygen, 4) + .components(Carbon * 10, Hydrogen * 10, Oxygen * 4) .color(0x56c48c) .build(); PolyethyleneTerephthalate = new Material.Builder(15289, SuSyUtility.susyId('polyethylene_terephthalate')) .polymer().liquid(new FluidBuilder().temperature(533)) .flags(GENERATE_FOIL) - .components(Carbon, 10, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 10, Hydrogen * 6, Oxygen * 4) .color(0x7e9e8e) .build(); @@ -1757,86 +1757,86 @@ public class OrganicChemistryMaterials { AmocoTerephthalicAcid = new Material.Builder(15290, SuSyUtility.susyId('amoco_terephthalic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0x66916c) .build(); AmocoIsophthalicAcid = new Material.Builder(15291, SuSyUtility.susyId('amoco_isophthalic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0x6b9166) .build(); ParaToluicAcid = new Material.Builder(15292, SuSyUtility.susyId('para_toluic_acid')) .dust().liquid(new FluidBuilder().attribute(FluidAttributes.ACID).temperature(454)) .flags(NO_UNIFICATION) - .components(Carbon, 8, Hydrogen, 8, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 8, Oxygen * 2) .color(0x83943a) .build(); MethylParaToluate = new Material.Builder(15293, SuSyUtility.susyId('methyl_para_toluate')) .liquid(new FluidBuilder().temperature(323)) - .components(Carbon, 9, Hydrogen, 10, Oxygen, 2) + .components(Carbon * 9, Hydrogen * 10, Oxygen * 2) .color(0x4e8538) .build(); CrudeDimethylTerephthalate = new Material.Builder(15294, SuSyUtility.susyId('crude_dimethyl_terephthalate')) .dust() - .components(Carbon, 10, Hydrogen, 10, Oxygen, 4) + .components(Carbon * 10, Hydrogen * 10, Oxygen * 4) .color(0x388568) .build(); WetTerephthalicAcid = new Material.Builder(15295, SuSyUtility.susyId('wet_terephthalic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0x669181) .iconSet(DULL) .build(); WetIsophthalicAcid = new Material.Builder(15296, SuSyUtility.susyId('wet_isophthalic_acid')) .dust() - .components(Carbon, 8, Hydrogen, 6, Oxygen, 4) + .components(Carbon * 8, Hydrogen * 6, Oxygen * 4) .color(0x609169) .iconSet(DULL) .build(); HydrogenDodecylSulfate = new Material.Builder(15297, SuSyUtility.susyId('hydrogen_dodecyl_sulfate')) .dust() - .components(Carbon, 12, Hydrogen, 26, Sulfur, 1, Oxygen, 4) + .components(Carbon * 12, Hydrogen * 26, Sulfur * 1, Oxygen * 4) .iconSet(SAND) .color(0xd8dbb8) .build(); SodiumDodecylSulfate = new Material.Builder(15298, SuSyUtility.susyId('sodium_dodecyl_sulfate')) .dust() - .components(Carbon, 12, Hydrogen, 25, Sulfur, 1, Oxygen, 4, Sodium, 1) + .components(Carbon * 12, Hydrogen * 25, Sulfur * 1, Oxygen * 4, Sodium * 1) .iconSet(SAND) .color(0xe6e4cf) .build(); Dinonylnaphthalene = new Material.Builder(15299, SuSyUtility.susyId('dinonylnaphthalene')) .dust() - .components(Carbon, 28, Hydrogen, 44) + .components(Carbon * 28, Hydrogen * 44) .iconSet(SAND) .color(0xbfa263) .build(); DinonylnaphthaleneSulfonicAcid = new Material.Builder(15300, SuSyUtility.susyId('dinonylnaphthalene_sulfonic_acid')) .dust() - .components(Carbon, 28, Hydrogen, 44, Sulfur, 1, Oxygen, 3) + .components(Carbon * 28, Hydrogen * 44, Sulfur * 1, Oxygen * 3) .iconSet(SAND) .color(0xbfb463) .build(); Pseudocumene = new Material.Builder(15301, SuSyUtility.susyId('pseudocumene')) .liquid() - .components(Carbon, 9, Hydrogen, 12) + .components(Carbon * 9, Hydrogen * 12) .color(0x553300) .build(); Methylcyclopentadiene = new Material.Builder(15302, SuSyUtility.susyId('methylcyclopentadiene')) .liquid() - .components(Carbon, 6, Hydrogen, 8) + .components(Carbon * 6, Hydrogen * 8) .color(0x57ab82) .build(); @@ -1844,13 +1844,13 @@ public class OrganicChemistryMaterials { Diglyme = new Material.Builder(15303, SuSyUtility.susyId('diglyme')) .liquid() - .components(Carbon, 6, Hydrogen, 14, Oxygen, 3) + .components(Carbon * 6, Hydrogen * 14, Oxygen * 3) .color(0x2f9982) .build(); Bismethylcyclopentadienylmanganese = new Material.Builder(15304, SuSyUtility.susyId('bismethylcyclopentadienylmanganese')) .liquid() - .components(Carbon, 12, Hydrogen, 10, Manganese, 1) + .components(Carbon * 12, Hydrogen * 10, Manganese * 1) .color(0x75250d) .build(); @@ -1858,7 +1858,7 @@ public class OrganicChemistryMaterials { MethylcyclopentadienylmanganeseTricarbonyl = new Material.Builder(15305, SuSyUtility.susyId('methylcyclopentadienylmanganese_tricarbonyl')) .liquid() - .components(Carbon, 9, Hydrogen, 7, Oxygen, 3, Manganese, 1) + .components(Carbon * 9, Hydrogen * 7, Oxygen * 3, Manganese * 1) .color(0xa16c0b) .build() @@ -1866,37 +1866,37 @@ public class OrganicChemistryMaterials { MethylCarbitol = new Material.Builder(15306, SuSyUtility.susyId('methyl_carbitol')) .liquid() - .components(Carbon, 5, Hydrogen, 12, Oxygen, 3) + .components(Carbon * 5, Hydrogen * 12, Oxygen * 3) .color(0x3fd1b1) .build(); DiisopropylParaPhenylenediamine = new Material.Builder(15307, SuSyUtility.susyId('diisopropyl_para_phenylenediamine')) .dust() - .components(Carbon, 12, Hydrogen, 22, Nitrogen, 2) + .components(Carbon * 12, Hydrogen * 22, Nitrogen * 2) .color(0x1d666e) .build(); OneTwoDiaminopropaneSolution = new Material.Builder(15308, SuSyUtility.susyId('one_two_diaminopropane_solution')) .liquid() - .components(Carbon, 3, Hydrogen, 10, Nitrogen, 2, Water, 1) + .components(Carbon * 3, Hydrogen * 10, Nitrogen * 2, Water * 1) .color(0x22b55d) .build(); Salicylaldehyde = new Material.Builder(15309, SuSyUtility.susyId('salicylaldehyde')) .liquid() - .components(Carbon, 7, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 7, Hydrogen * 6, Oxygen * 2) .color(0x3f44a6) .build(); SalicylideneOneTwoPropanediamine = new Material.Builder(15310, SuSyUtility.susyId('salicylidene_one_two_propanediamine')) .dust() - .components(Carbon, 17, Hydrogen, 18, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 17, Hydrogen * 18, Nitrogen * 2, Oxygen * 2) .color(0x571f80) .build(); EthyleneVinylAcetate = new Material.Builder(15311, SuSyUtility.susyId('ethylene_vinyl_acetate')) .polymer() - .components(Ethylene, 1, VinylAcetate, 1) + .components(Ethylene * 1, VinylAcetate * 1) .color(0x686ad4) .fluidPipeProperties(363, 100, true) .iconSet(DULL) @@ -1904,32 +1904,32 @@ public class OrganicChemistryMaterials { EthyleneIsobutyleneVinylAcetate = new Material.Builder(15312, SuSyUtility.susyId('ethylene_isobutylene_vinyl_acetate')) .dust() - .components(Ethylene, 1, Isobutylene, 1, VinylAcetate, 1) + .components(Ethylene * 1, Isobutylene * 1, VinylAcetate * 1) .color(0x8768d4) .iconSet(DULL) .build(); Dihexadecylamine = new Material.Builder(15313, SuSyUtility.susyId('dihexadecylamine')) .liquid(new FluidBuilder().temperature(340)) - .components(Carbon, 32, Hydrogen, 67, Nitrogen, 1) + .components(Carbon * 32, Hydrogen * 67, Nitrogen * 1) .color(0x5f6e0e) .build(); DihexadecylaminePhthalateAmide = new Material.Builder(15314, SuSyUtility.susyId('dihexadecylamine_phthalate_amide')) .dust() - .components(Carbon, 72, Hydrogen, 138, Nitrogen, 2, Oxygen, 3) + .components(Carbon * 72, Hydrogen * 138, Nitrogen * 2, Oxygen * 3) .color(0x3e6e0e) .build(); MethylTertButylEther = new Material.Builder(15315, SuSyUtility.susyId('methyl_tert_butyl_ether')) .liquid() - .components(Carbon, 5, Hydrogen, 12, Oxygen, 1) + .components(Carbon * 5, Hydrogen * 12, Oxygen * 1) .color(0xae21b0) .build(); TetraethylOrthosilicate = new Material.Builder(15316, SuSyUtility.susyId('tetraethyl_orthosilicate')) .liquid() - .components(Silicon, 1, Carbon, 8, Hydrogen, 20, Oxygen, 4) + .components(Silicon * 1, Carbon * 8, Hydrogen * 20, Oxygen * 4) .color(0x96a894) .build(); @@ -1937,7 +1937,7 @@ public class OrganicChemistryMaterials { Methylphenyldichlorosilane = new Material.Builder(15317, SuSyUtility.susyId('methylphenyldichlorosilane')) .liquid() - .components(Silicon, 1, Carbon, 7, Hydrogen, 8, Chlorine, 2) + .components(Silicon * 1, Carbon * 7, Hydrogen * 8, Chlorine * 2) .color(0x9ba178) .build(); @@ -1945,61 +1945,61 @@ public class OrganicChemistryMaterials { OneOctene = new Material.Builder(15318, SuSyUtility.susyId('one_octene')) .liquid() - .components(Carbon, 8, Hydrogen, 16) + .components(Carbon * 8, Hydrogen * 16) .color(0xd68b9d) .build(); OneDecene = new Material.Builder(15319, SuSyUtility.susyId('one_decene')) .liquid() - .components(Carbon, 10, Hydrogen, 20) + .components(Carbon * 10, Hydrogen * 20) .color(0xbf7184) .build(); OneDodecene = new Material.Builder(15320, SuSyUtility.susyId('one_dodecene')) .liquid() - .components(Carbon, 12, Hydrogen, 24) + .components(Carbon * 12, Hydrogen * 24) .color(0xb0566c) .build(); OneTetradecene = new Material.Builder(15321, SuSyUtility.susyId('one_tetradecene')) .liquid() - .components(Carbon, 14, Hydrogen, 28) + .components(Carbon * 14, Hydrogen * 28) .color(0xb54a64) .build(); OneHexadecene = new Material.Builder(15322, SuSyUtility.susyId('one_hexadecene')) .liquid() - .components(Carbon, 16, Hydrogen, 32) + .components(Carbon * 16, Hydrogen * 32) .color(0xcc4969) .build(); OneOctadecene = new Material.Builder(15323, SuSyUtility.susyId('one_octadecene')) .liquid() - .components(Carbon, 18, Hydrogen, 36) + .components(Carbon * 18, Hydrogen * 36) .color(0xd94368) .build(); OneIcosene = new Material.Builder(15324, SuSyUtility.susyId('one_icosene')) .liquid(new FluidBuilder().temperature(308)) - .components(Carbon, 20, Hydrogen, 40) + .components(Carbon * 20, Hydrogen * 40) .color(0xe63560) .build(); OneDocosene = new Material.Builder(15325, SuSyUtility.susyId('one_docosene')) .liquid(new FluidBuilder().temperature(310)) - .components(Carbon, 22, Hydrogen, 44) + .components(Carbon * 22, Hydrogen * 44) .color(0xcf2750) .build(); OneTetracosene = new Material.Builder(15326, SuSyUtility.susyId('one_tetracosene')) .liquid(new FluidBuilder().temperature(318)) - .components(Carbon, 24, Hydrogen, 48) + .components(Carbon * 24, Hydrogen * 48) .color(0xb51b41) .build(); Polybutene = new Material.Builder(15327, SuSyUtility.susyId('polybutene')) .liquid() - .components(Carbon, 4, Hydrogen, 8) + .components(Carbon * 4, Hydrogen * 8) .color(0xb5471b) .build(); @@ -2007,25 +2007,25 @@ public class OrganicChemistryMaterials { TrimelliticAcid = new Material.Builder(15328, SuSyUtility.susyId('trimellitic_acid')) .dust() - .components(Carbon, 9, Hydrogen, 6, Oxygen, 6) + .components(Carbon * 9, Hydrogen * 6, Oxygen * 6) .color(0xcb6fde) .build(); TrimelliticAnhydride = new Material.Builder(15329, SuSyUtility.susyId('trimellitic_anhydride')) .dust() - .components(Carbon, 9, Hydrogen, 4, Oxygen, 5) + .components(Carbon * 9, Hydrogen * 4, Oxygen * 5) .color(0xac59bd) .build(); Oleylamide = new Material.Builder(15330, SuSyUtility.susyId('oleylamide')) .liquid() - .components(Carbon, 18, Hydrogen, 35, Nitrogen, 1, Oxygen, 1) + .components(Carbon * 18, Hydrogen * 35, Nitrogen * 1, Oxygen * 1) .color(0x59bbbd) .build(); StearicAcid = new Material.Builder(15331, SuSyUtility.susyId('stearic_acid')) .liquid(new FluidBuilder().temperature(342)) - .components(Carbon, 18, Hydrogen, 36, Oxygen, 2) + .components(Carbon * 18, Hydrogen * 36, Oxygen * 2) .color(0xd3d4ae) .build(); @@ -2033,25 +2033,25 @@ public class OrganicChemistryMaterials { OneNitronaphthalene = new Material.Builder(15333, SuSyUtility.susyId('one_nitronaphthalene')) .dust() - .components(Carbon, 10, Hydrogen, 7, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 10, Hydrogen * 7, Nitrogen * 1, Oxygen * 2) .color(0x82bd8a) .build(); OneNaphthylamine = new Material.Builder(15334, SuSyUtility.susyId('one_naphthylamine')) .dust().liquid(new FluidBuilder().temperature(322)) - .components(Carbon, 10, Hydrogen, 9, Nitrogen, 1) + .components(Carbon * 10, Hydrogen * 9, Nitrogen * 1) .color(0x82bd9c) .build(); NPhenylOneNaphthylamine = new Material.Builder(15335, SuSyUtility.susyId('n_phenyl_one_naphthylamine')) .dust() - .components(Carbon, 16, Hydrogen, 13, Nitrogen, 1) + .components(Carbon * 16, Hydrogen * 13, Nitrogen * 1) .color(0x62a37f) .build(); Polyisobutene = new Material.Builder(15336, SuSyUtility.susyId('polyisobutene')) .dust() - .components(Carbon, 4, Hydrogen, 8) + .components(Carbon * 4, Hydrogen * 8) .color(0x944234) .build(); @@ -2059,7 +2059,7 @@ public class OrganicChemistryMaterials { EthylenePropyleneCopolymer = new Material.Builder(15337, SuSyUtility.susyId('ethylene_propylene_copolymer')) .dust() - .components(Carbon, 5, Hydrogen, 10) + .components(Carbon * 5, Hydrogen * 10) .color(0xbab18a) .build(); @@ -2067,19 +2067,19 @@ public class OrganicChemistryMaterials { MethacrylicAcid = new Material.Builder(15338, SuSyUtility.susyId('methacrylic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 2) .color(0x5590ad) .build(); StyreneIsopreneSolution = new Material.Builder(15339, SuSyUtility.susyId('styrene_isoprene_solution')) .liquid() - .components(Isoprene, 3, Styrene, 1, Ethanol, 1) + .components(Isoprene * 3, Styrene * 1, Ethanol * 1) .color(0x520734) .build(); RawStyreneIsopreneRubber = new Material.Builder(15340, SuSyUtility.susyId('raw_styrene_isoprene_rubber')) .dust() - .components(Isoprene, 3, Styrene, 1) + .components(Isoprene * 3, Styrene * 1) .color(0x3d0727) .build(); @@ -2087,13 +2087,13 @@ public class OrganicChemistryMaterials { .polymer() .iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_RING) - .components(Isoprene, 3, Styrene, 1) + .components(Isoprene * 3, Styrene * 1) .color(0x57103a) .build(); HydrogenatedStyreneIsopreneRubber = new Material.Builder(15342, SuSyUtility.susyId('hydrogenated_styrene_isoprene_rubber')) .dust() - .components(Carbon, 23, Hydrogen, 38) + .components(Carbon * 23, Hydrogen * 38) .color(0x70186c) .build(); @@ -2101,7 +2101,7 @@ public class OrganicChemistryMaterials { HydrogenatedStyreneButadieneRubber = new Material.Builder(15343, SuSyUtility.susyId('hydrogenated_styrene_butadiene_rubber')) .dust() - .components(Carbon, 20, Hydrogen, 32) + .components(Carbon * 20, Hydrogen * 32) .color(0x701818) .build(); @@ -2109,13 +2109,13 @@ public class OrganicChemistryMaterials { Dodecylphenol = new Material.Builder(15344, SuSyUtility.susyId('dodecylphenol')) .dust() - .components(Carbon, 18, Hydrogen, 30, Oxygen, 1) + .components(Carbon * 18, Hydrogen * 30, Oxygen * 1) .color(0x4c3c63) .build(); CalciumPhenate = new Material.Builder(15345, SuSyUtility.susyId('calcium_phenate')) .liquid() - .components(Calcite, 1, Carbon, 18, Hydrogen, 29, Oxygen, 1, Sulfur, 1) + .components(Calcite * 1, Carbon * 18, Hydrogen * 29, Oxygen * 1, Sulfur * 1) .color(0x4a3f0a) .build(); @@ -2123,19 +2123,19 @@ public class OrganicChemistryMaterials { Dodecylbenzene = new Material.Builder(15347, SuSyUtility.susyId('dodecylbenzene')) .dust() - .components(Carbon, 18, Hydrogen, 30) + .components(Carbon * 18, Hydrogen * 30) .color(0x604882) .build(); DodecylbenzenesulfonicAcid = new Material.Builder(15348, SuSyUtility.susyId('dodecylbenzenesulfonic_acid')) .dust() - .components(Carbon, 18, Hydrogen, 30, Sulfur, 1, Oxygen, 3) + .components(Carbon * 18, Hydrogen * 30, Sulfur * 1, Oxygen * 3) .color(0x7c4882) .build(); CalciumDodecylbenzeneSulfonate = new Material.Builder(15349, SuSyUtility.susyId('calcium_dodecylbenzene_sulfonate')) .dust() - .components(Calcium, 1, Carbon, 36, Hydrogen, 60, Sulfur, 2, Oxygen, 6) + .components(Calcium * 1, Carbon * 36, Hydrogen * 60, Sulfur * 2, Oxygen * 6) .color(0x944a7c) .build(); @@ -2143,7 +2143,7 @@ public class OrganicChemistryMaterials { CalciumSalicylate = new Material.Builder(15350, SuSyUtility.susyId('calcium_salicylate')) .dust() - .components(Calcium, 1, Carbon, 14, Hydrogen, 10, Oxygen, 6) + .components(Calcium * 1, Carbon * 14, Hydrogen * 10, Oxygen * 6) .color(0x64bd90) .build(); @@ -2151,13 +2151,13 @@ public class OrganicChemistryMaterials { MaleicAnhydride = new Material.Builder(15351, SuSyUtility.susyId('maleic_anhydride')) .dust() - .components(Carbon, 4, Hydrogen, 2, Oxygen, 3) + .components(Carbon * 4, Hydrogen * 2, Oxygen * 3) .color(0xdb42ba) .build(); CalciumDinonylnaphthaleneSulfonate = new Material.Builder(15352, SuSyUtility.susyId('calcium_dinonylnaphthalene_sulfonate')) .dust() - .components(Calcium, 1, Carbon, 56, Hydrogen, 86, Sulfur, 2, Oxygen, 6) + .components(Calcium * 1, Carbon * 56, Hydrogen * 86, Sulfur * 2, Oxygen * 6) .color(0x42a3db) .build(); @@ -2165,37 +2165,37 @@ public class OrganicChemistryMaterials { MetaParaCresolMixture = new Material.Builder(15353, SuSyUtility.susyId('meta_para_cresol_mixture')) .liquid() - .components(Carbon, 7, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 7, Hydrogen * 8, Oxygen * 1) .color(0x73674e) .build(); OrthoCresol = new Material.Builder(15354, SuSyUtility.susyId('ortho_cresol')) .liquid() - .components(Carbon, 7, Hydrogen, 8, Oxygen, 1) + .components(Carbon * 7, Hydrogen * 8, Oxygen * 1) .color(0xb5a991) .build(); TricresylPhosphate = new Material.Builder(15355, SuSyUtility.susyId('tricresyl_phosphate')) .liquid() - .components(Carbon, 21, Hydrogen, 21, Oxygen, 4, Phosphorus, 1) + .components(Carbon * 21, Hydrogen * 21, Oxygen * 4, Phosphorus * 1) .color(0x9c924b) .build(); DiisopropyldithiophosphoricAcid = new Material.Builder(15356, SuSyUtility.susyId('diisopropyldithiophosphoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 6, Hydrogen, 15, Oxygen, 2, Phosphorus, 1, Sulfur, 2) + .components(Carbon * 6, Hydrogen * 15, Oxygen * 2, Phosphorus * 1, Sulfur * 2) .color(0x857714) .build(); DibutyldithiophosphoricAcid = new Material.Builder(15357, SuSyUtility.susyId('dibutyldithiophosphoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 8, Hydrogen, 34, Oxygen, 2, Phosphorus, 1, Sulfur, 2) + .components(Carbon * 8, Hydrogen * 34, Oxygen * 2, Phosphorus * 1, Sulfur * 2) .color(0x856914) .build(); TwoButoxyethanol = new Material.Builder(15358, SuSyUtility.susyId('two_butoxyethanol')) .liquid() - .components(Carbon, 6, Hydrogen, 14, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 14, Oxygen * 2) .color(0xa0c9db) .build(); @@ -2203,13 +2203,13 @@ public class OrganicChemistryMaterials { Diamylamine = new Material.Builder(15360, SuSyUtility.susyId('diamylamine')) .liquid() - .components(Carbon, 10, Hydrogen, 23, Nitrogen, 1) + .components(Carbon * 10, Hydrogen * 23, Nitrogen * 1) .color(0x2b7842) .build(); SodiumDiamylthiocarbamateSolution = new Material.Builder(15361, SuSyUtility.susyId('sodium_diamyldithiocarbamate_solution')) .liquid() - .components(Carbon, 11, Hydrogen, 22, Nitrogen, 1, Sulfur, 2, Sodium, 1, Water, 1) + .components(Carbon * 11, Hydrogen * 22, Nitrogen * 1, Sulfur * 2, Sodium * 1, Water * 1) .color(0x2b7865) .build(); @@ -2217,7 +2217,7 @@ public class OrganicChemistryMaterials { ZincBisdiamyldithiocarbamate = new Material.Builder(15362, SuSyUtility.susyId('zinc_bisdiamyldithiocarbamate')) .dust() - .components(Zinc, 1, Carbon, 22, Hydrogen, 44, Nitrogen, 2, Sulfur, 4) + .components(Zinc * 1, Carbon * 22, Hydrogen * 44, Nitrogen * 2, Sulfur * 4) .color(0x69782b) .build(); @@ -2225,19 +2225,19 @@ public class OrganicChemistryMaterials { Didodecylbenzene = new Material.Builder(15363, SuSyUtility.susyId('didodecylbenzene')) .dust() - .components(Carbon, 30, Hydrogen, 54) + .components(Carbon * 30, Hydrogen * 54) .color(0x327894) .build(); DidodecylbenzenesulfonicAcid = new Material.Builder(15364, SuSyUtility.susyId('didodecylbenzenesulfonic_acid')) .dust() - .components(Carbon, 30, Hydrogen, 54, Sulfur, 1, Oxygen, 3) + .components(Carbon * 30, Hydrogen * 54, Sulfur * 1, Oxygen * 3) .color(0x32947c) .build(); CalciumDidodecylbenzeneSulfonate = new Material.Builder(15365, SuSyUtility.susyId('calcium_didodecylbenzene_sulfonate')) .dust() - .components(Calcium, 1, Carbon, 60, Hydrogen, 106, Sulfur, 2, Oxygen, 6) + .components(Calcium * 1, Carbon * 60, Hydrogen * 106, Sulfur * 2, Oxygen * 6) .color(0x325994) .build(); @@ -2245,78 +2245,78 @@ public class OrganicChemistryMaterials { Nonylphenol = new Material.Builder(15366, SuSyUtility.susyId('nonylphenol')) .liquid() - .components(Carbon, 15, Hydrogen, 24, Oxygen, 1) + .components(Carbon * 15, Hydrogen * 24, Oxygen * 1) .color(0x4070b8) .build(); Trichloroethylene = new Material.Builder(15367, SuSyUtility.susyId('trichloroethylene')) .liquid() - .components(Carbon, 2, Hydrogen, 1, Chlorine, 3) + .components(Carbon * 2, Hydrogen * 1, Chlorine * 3) .color(0x55a663) .build(); ChloroaceticAcid = new Material.Builder(15368, SuSyUtility.susyId('chloroacetic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 2, Hydrogen, 3, Chlorine, 1, Oxygen, 2) + .components(Carbon * 2, Hydrogen * 3, Chlorine * 1, Oxygen * 2) .color(0x58a33b) .build(); FourNonylphenoxyaceticAcid = new Material.Builder(15369, SuSyUtility.susyId('four_nonylphenoxyacetic_acid')) .dust() - .components(Carbon, 17, Hydrogen, 26, Oxygen, 3) + .components(Carbon * 17, Hydrogen * 26, Oxygen * 3) .color(0x953ba3) .build(); TwoNitroanilineSolution = new Material.Builder(15370, SuSyUtility.susyId('two_nitroaniline_solution')) .liquid() - .components(Carbon, 6, Hydrogen, 6, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 6, Hydrogen * 6, Nitrogen * 2, Oxygen * 2) .color(0x7653bd) .build(); OrthoPhenylenediamine = new Material.Builder(15371, SuSyUtility.susyId('ortho_phenylenediamine')) .dust() - .components(Carbon, 6, Hydrogen, 8, Nitrogen, 2) + .components(Carbon * 6, Hydrogen * 8, Nitrogen * 2) .color(0x252a80) .build(); Benzotriazole = new Material.Builder(15372, SuSyUtility.susyId('benzotriazole')) .dust() - .components(Carbon, 6, Hydrogen, 5, Nitrogen, 3) + .components(Carbon * 6, Hydrogen * 5, Nitrogen * 3) .color(0x4971ad) .build(); Mercaptobenzothiazole = new Material.Builder(15373, SuSyUtility.susyId('mercaptobenzothiazole')) .dust() - .components(Carbon, 7, Hydrogen, 5, Nitrogen, 1, Sulfur, 2) + .components(Carbon * 7, Hydrogen * 5, Nitrogen * 1, Sulfur * 2) .color(0x878000) .build(); SalicylideneEthylenediamine = new Material.Builder(15374, SuSyUtility.susyId('salicylidene_ethylenediamine')) .dust() - .components(Carbon, 16, Hydrogen, 16, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 16, Hydrogen * 16, Nitrogen * 2, Oxygen * 2) .color(0x5c84c4) .build(); PolyethyleneGlycol = new Material.Builder(15375, SuSyUtility.susyId('polyethylene_glycol')) .liquid() - .components(Carbon, 2, Hydrogen, 4, Oxygen, 1) + .components(Carbon * 2, Hydrogen * 4, Oxygen * 1) .color(0x599c8e) .build(); OneThreeDinitrobenzene = new Material.Builder(15377, SuSyUtility.susyId('one_three_dinitrobenzene')) .dust() - .components(Carbon, 6, Hydrogen, 4, Nitrogen, 2, Oxygen, 4) + .components(Carbon * 6, Hydrogen * 4, Nitrogen * 2, Oxygen * 4) .color(0x1c718a) .build(); MetaPhenylenediamine = new Material.Builder(15378, SuSyUtility.susyId('meta_phenylenediamine')) .dust() - .components(Carbon, 6, Hydrogen, 8, Nitrogen, 2) + .components(Carbon * 6, Hydrogen * 8, Nitrogen * 2) .color(0x1e89a8) .build(); Nomex = new Material.Builder(15379, SuSyUtility.susyId('nomex')) - .components(Carbon, 14, Hydrogen, 10, Nitrogen, 2, Oxygen, 2) + .components(Carbon * 14, Hydrogen * 10, Nitrogen * 2, Oxygen * 2) .color(0x5d95a3) .build(); @@ -2326,7 +2326,7 @@ public class OrganicChemistryMaterials { UltraHighMolecularWeightPolyethylene = new Material.Builder(15380, SuSyUtility.susyId('ultra_high_molecular_weight_polyethylene')) .dust().liquid(new FluidBuilder().temperature(425)) .flags(GENERATE_PLATE) - .components(Carbon, 2, Hydrogen, 4) + .components(Carbon * 2, Hydrogen * 4) .color(0xc5e3de) .iconSet(SHINY) .build(); @@ -2336,43 +2336,43 @@ public class OrganicChemistryMaterials { AdipicAcid = new Material.Builder(15381, SuSyUtility.susyId('adipic_acid')) .dust() - .components(Carbon, 6, Hydrogen, 10, Oxygen, 4) + .components(Carbon * 6, Hydrogen * 10, Oxygen * 4) .color(0xe3ddb6) .build(); Trimethylolpropane = new Material.Builder(15382, SuSyUtility.susyId('trimethylolpropane')) .dust() - .components(Carbon, 6, Hydrogen, 14, Oxygen, 3) + .components(Carbon * 6, Hydrogen * 14, Oxygen * 3) .color(0x5d8230) .build(); AcrylicAcid = new Material.Builder(15383, SuSyUtility.susyId('acrylic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 3, Hydrogen, 4, Oxygen, 2) + .components(Carbon * 3, Hydrogen * 4, Oxygen * 2) .color(0x308264) .build(); TrimethylolpropaneTriacrylate = new Material.Builder(15384, SuSyUtility.susyId('trimethylolpropane_triacrylate')) .liquid() - .components(Carbon, 15, Hydrogen, 20, Oxygen, 6) + .components(Carbon * 15, Hydrogen * 20, Oxygen * 6) .color(0x279630) .build(); BenzenediazoniumChloride = new Material.Builder(15385, SuSyUtility.susyId('benzenediazonium_chloride')) .dust() - .components(Carbon, 6, Hydrogen, 5, Nitrogen, 2, Chlorine, 1) + .components(Carbon * 6, Hydrogen * 5, Nitrogen * 2, Chlorine * 1) .color(0x18262b) .build(); Crotonaldehyde = new Material.Builder(15386, SuSyUtility.susyId('crotonaldehyde')) .liquid() - .components(Carbon, 4, Hydrogen, 6, Oxygen, 1) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 1) .color(0xa31a5c) .build(); CalciumAcetate = new Material.Builder(15387, SuSyUtility.susyId('calcium_acetate')) .dust() - .components(Calcium, 1, Carbon, 4, Hydrogen, 6, Oxygen, 4) + .components(Calcium * 1, Carbon * 4, Hydrogen * 6, Oxygen * 4) .color(0xe3dcc8) .iconSet(QUARTZ) .build(); @@ -2381,7 +2381,7 @@ public class OrganicChemistryMaterials { GaseousMethacroleinMixture = new Material.Builder(15388, SuSyUtility.susyId('gaseous_methacrolein_mixture')) .gas(new FluidBuilder().temperature(434)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 1, Steam, 1) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 1, Steam * 1) .colorAverage() .build(); @@ -2389,7 +2389,7 @@ public class OrganicChemistryMaterials { GaseousMethacroleinResidue = new Material.Builder(15389, SuSyUtility.susyId('gaseous_methacrolein_residue')) .gas(new FluidBuilder().temperature(434)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 1, Steam, 4) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 1, Steam * 4) .colorAverage() .build(); @@ -2397,7 +2397,7 @@ public class OrganicChemistryMaterials { AbsorbedMethacrolein = new Material.Builder(15390, SuSyUtility.susyId('absorbed_methacrolein')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 1, AceticAcid, 4, Water, 5) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 1, AceticAcid * 4, Water * 5) .colorAverage() .build(); @@ -2405,7 +2405,7 @@ public class OrganicChemistryMaterials { Tetraethyllead = new Material.Builder(15391, SuSyUtility.susyId('tetraethyllead')) .liquid() - .components(Carbon, 8, Hydrogen, 20, Lead, 1) + .components(Carbon * 8, Hydrogen * 20, Lead * 1) .colorAverage() .build(); @@ -2413,7 +2413,7 @@ public class OrganicChemistryMaterials { TertButylHydroperoxide = new Material.Builder(15392, SuSyUtility.susyId('tert_butyl_hydroperoxide')) .liquid() - .components(Carbon, 4, Hydrogen, 10, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 10, Oxygen * 2) .colorAverage() .build(); @@ -2421,7 +2421,7 @@ public class OrganicChemistryMaterials { DiTertButylPeroxide = new Material.Builder(15393, SuSyUtility.susyId('di_tert_butyl_peroxide')) .liquid() - .components(Carbon, 8, Hydrogen, 18, Oxygen, 2) + .components(Carbon * 8, Hydrogen * 18, Oxygen * 2) .colorAverage() .build(); @@ -2429,26 +2429,26 @@ public class OrganicChemistryMaterials { TwoEthylhexylNitrate = new Material.Builder(15394, SuSyUtility.susyId('two_ethylhexyl_nitrate')) .liquid() - .components(Carbon, 8, Hydrogen, 17, Nitrogen, 1, Oxygen, 3) + .components(Carbon * 8, Hydrogen * 17, Nitrogen * 1, Oxygen * 3) .colorAverage() .build(); Nitromethane = new Material.Builder(15395, SuSyUtility.susyId('nitromethane')) .liquid() - .components(Carbon, 1, Hydrogen, 3, Nitrogen, 1, Oxygen, 2) + .components(Carbon * 1, Hydrogen * 3, Nitrogen * 1, Oxygen * 2) .colorAverage() .build(); SodiumBisphenolateSolution = new Material.Builder(15396, SuSyUtility.susyId('sodium_bisphenolate_solution')) .liquid() - .components(SodiumHydroxide, 2, BisphenolA, 1, Water, 2) + .components(SodiumHydroxide * 2, BisphenolA * 1, Water * 2) .colorAverage() .build(); Polycarbonate = new Material.Builder(15397, SuSyUtility.susyId('polycarbonate')) .polymer() .flags(GENERATE_PLATE) - .components(Carbon, 16, Hydrogen, 14, Oxygen, 3) + .components(Carbon * 16, Hydrogen * 14, Oxygen * 3) .color(0xa1cacf) .iconSet(SHINY) .build(); @@ -2457,43 +2457,43 @@ public class OrganicChemistryMaterials { Trichlorofluoromethane = new Material.Builder(15398, SuSyUtility.susyId('trichlorofluoromethane')) .gas() - .components(Carbon, 1, Chlorine, 3, Fluorine, 1) + .components(Carbon * 1, Chlorine * 3, Fluorine * 1) .color(0xeb6a6a) .build(); Dichlorodifluoromethane = new Material.Builder(15399, SuSyUtility.susyId('dichlorodifluoromethane')) .gas() - .components(Carbon, 1, Chlorine, 2, Fluorine, 2) + .components(Carbon * 1, Chlorine * 2, Fluorine * 2) .color(0xd14d4d) .build(); Chlorotrifluoromethane = new Material.Builder(15400, SuSyUtility.susyId('chlorotrifluoromethane')) .gas() - .components(Carbon, 1, Chlorine, 1, Fluorine, 3) + .components(Carbon * 1, Chlorine * 1, Fluorine * 3) .color(0xbf3232) .build(); Chlorodifluoromethane = new Material.Builder(15401, SuSyUtility.susyId('chlorodifluoromethane')) .gas() - .components(Carbon, 1, Hydrogen, 1, Chlorine, 1, Fluorine, 2) + .components(Carbon * 1, Hydrogen * 1, Chlorine * 1, Fluorine * 2) .color(0x8c5a99) .build(); Acrolein = new Material.Builder(15402, SuSyUtility.susyId('acrolein')) .liquid() - .components(Carbon, 3, Hydrogen, 4, Oxygen, 1) + .components(Carbon * 3, Hydrogen * 4, Oxygen * 1) .color(0x389c7a) .build(); Dicyclopentadiene = new Material.Builder(15403, SuSyUtility.susyId('dicyclopentadiene')) .liquid(new FluidBuilder().temperature(306)) - .components(Carbon, 10, Hydrogen, 12) + .components(Carbon * 10, Hydrogen * 12) .color(0x9c388b) .build(); SodiumMethoxide = new Material.Builder(15404, SuSyUtility.susyId('sodium_methoxide')) .dust() - .components(Carbon, 1, Hydrogen, 3, Oxygen, 1, Sodium, 1) + .components(Carbon * 1, Hydrogen * 3, Oxygen * 1, Sodium * 1) .color(0xd19c21) .build(); @@ -2509,13 +2509,13 @@ public class OrganicChemistryMaterials { EthylAcetate = new Material.Builder(15407, SuSyUtility.susyId('ethyl_acetate')) .liquid() - .components(Carbon, 4, Hydrogen, 8, Oxygen, 2) + .components(Carbon * 4, Hydrogen * 8, Oxygen * 2) .color(0xa5c773) .build(); FormicAcid = new Material.Builder(15408, SuSyUtility.susyId('formic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Carbon, 1, Hydrogen, 2, Oxygen, 2) + .components(Carbon * 1, Hydrogen * 2, Oxygen * 2) .color(0xbf395b) .build(); @@ -2526,7 +2526,7 @@ public class OrganicChemistryMaterials { PolyvinylAlcohol = new Material.Builder(15410, SuSyUtility.susyId('polyvinyl_alcohol')) .dust() - .components(Carbon, 2, Hydrogen, 4, Oxygen, 1) + .components(Carbon * 2, Hydrogen * 4, Oxygen * 1) .color(0xd4984e) .build(); } diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy index a23155930..ea5c6d588 100644 --- a/groovy/material/SecondDegreeMaterials.groovy +++ b/groovy/material/SecondDegreeMaterials.groovy @@ -23,44 +23,44 @@ public class SecondDegreeMaterials { NitrateSaltMix = new Material.Builder(13000, SuSyUtility.susyId('nitrate_salt_mix')) .dust() - .components(AmmoniumChloride, 1, Saltpeter, 1) + .components(AmmoniumChloride * 1, Saltpeter * 1) .colorAverage() .build(); AmmoniumChlorideSolution = new Material.Builder(13001, SuSyUtility.susyId('ammonium_chloride_solution')) .liquid() - .components(AmmoniumChloride, 1, Water, 1) + .components(AmmoniumChloride * 1, Water * 1) .colorAverage() .build(); PotassiumChlorideSolution = new Material.Builder(13002, SuSyUtility.susyId('potassium_chloride_solution')) .liquid() .color(0x3b5eeb) - .components(RockSalt, 1, Water, 1) + .components(RockSalt * 1, Water * 1) .colorAverage() .build(); PotassiumBisulfateSolution = new Material.Builder(13003, SuSyUtility.susyId('potassium_bisulfate_solution')) .liquid() - .components(PotassiumBisulfate, 1, Water, 1) + .components(PotassiumBisulfate * 1, Water * 1) .colorAverage() .build(); SodiumBisulfateSolution = new Material.Builder(13004, SuSyUtility.susyId('sodium_bisulfate_solution')) .liquid() - .components(SodiumBisulfate, 1, Water, 1) + .components(SodiumBisulfate * 1, Water * 1) .colorAverage() .build(); CalciumChlorideSolution = new Material.Builder(13005, SuSyUtility.susyId('calcium_chloride_solution')) .liquid() - .components(CalciumChloride, 1, Water, 1) + .components(CalciumChloride * 1, Water * 1) .colorAverage() .build(); SodaAshSolution = new Material.Builder(13006, SuSyUtility.susyId('soda_ash_solution')) .liquid() - .components(SodaAsh, 1, Water, 1) + .components(SodaAsh * 1, Water * 1) .colorAverage() .build(); @@ -72,157 +72,157 @@ public class SecondDegreeMaterials { AmmoniumNitrateSolution = new Material.Builder(13008, SuSyUtility.susyId('ammonium_nitrate_solution')) .liquid() - .components(material('ammonium_nitrate'), 1, Water, 1) + .components(material('ammonium_nitrate'), Water * 1) .colorAverage() .build(); NitrateSolution = new Material.Builder(13009, SuSyUtility.susyId('nitrate_solution')) .liquid() - .components(AmmoniumChloride, 1, Saltpeter, 1, Water, 2) + .components(AmmoniumChloride * 1, Saltpeter * 1, Water * 2) .colorAverage() .build(); SodiumNitrateSolution = new Material.Builder(13010, SuSyUtility.susyId('sodium_nitrate_solution')) .liquid() - .components(SodiumNitrate, 1, Water, 1) + .components(SodiumNitrate * 1, Water * 1) .colorAverage() .build(); DilutedPotassiumCarbonateSolution = new Material.Builder(13011, SuSyUtility.susyId('diluted_potassium_carbonate_solution')) .liquid() - .components(PotassiumCarbonate, 1, Water, 3) + .components(PotassiumCarbonate * 1, Water * 3) .colorAverage() .build(); PotassiumHydroxideSolution = new Material.Builder(13012, SuSyUtility.susyId('potassium_hydroxide_solution')) .liquid() - .components(PotassiumHydroxide, 1, Water, 1) + .components(PotassiumHydroxide * 1, Water * 1) .colorAverage() .build(); CalciumHydroxideSlurry = new Material.Builder(13013, SuSyUtility.susyId('calcium_hydroxide_slurry')) .liquid() - .components(material('calcium_hydroxide'), 1, Water, 1) + .components(material('calcium_hydroxide'), Water * 1) .colorAverage() .build(); SodiumSilicateSolution = new Material.Builder(13014, SuSyUtility.susyId('sodium_silicate_solution')) .liquid() - .components(SodiumSilicate, 1, Water, 1) + .components(SodiumSilicate * 1, Water * 1) .colorAverage() .build(); SodiumAluminateSolution = new Material.Builder(13015, SuSyUtility.susyId('sodium_aluminate_solution')) .liquid() - .components(SodiumAluminate, 1, Water, 1) + .components(SodiumAluminate * 1, Water * 1) .color(0x3f71bf) .build(); SodiumFluorideSolution = new Material.Builder(13016, SuSyUtility.susyId('sodium_fluoride_solution')) .liquid() - .components(SodiumFluoride, 1, Water, 1) + .components(SodiumFluoride * 1, Water * 1) .colorAverage() .build(); PotassiumFluorideSolution = new Material.Builder(13017, SuSyUtility.susyId('potassium_fluoride_solution')) .liquid() - .components(PotassiumFluoride, 1, Water, 1) + .components(PotassiumFluoride * 1, Water * 1) .colorAverage() .build(); PotassiumTetrafluoroborateSolution = new Material.Builder(13018, SuSyUtility.susyId('potassium_tetrafluoroborate_solution')) .liquid() - .components(PotassiumTetrafluoroborate, 2, Water, 7) + .components(PotassiumTetrafluoroborate * 2, Water * 7) .color(0x8fb5a3) .build(); SodiumBromideSolution = new Material.Builder(13019, SuSyUtility.susyId('sodium_bromide_solution')) .liquid() - .components(SodiumBromide, 1, Water, 1) + .components(SodiumBromide * 1, Water * 1) .colorAverage() .build(); WackerCatalyst = new Material.Builder(13020, SuSyUtility.susyId('wacker_catalyst')) .dust() - .components(PalladiumChloride, 1, CopperIIChloride, 1) + .components(PalladiumChloride * 1, CopperIIChloride * 1) .colorAverage() .build(); PotassiumIodideSolution = new Material.Builder(13021, SuSyUtility.susyId('potassium_iodide_solution')) .liquid() - .components(PotassiumIodide, 1, Water, 1) + .components(PotassiumIodide * 1, Water * 1) .colorAverage() .build(); SodiumSulfateSolution = new Material.Builder(13022, SuSyUtility.susyId('sodium_sulfate_solution')) .liquid() - .components(SodiumSulfate, 1, Water, 1) + .components(SodiumSulfate * 1, Water * 1) .color(0xb0b0bf) .build() ImpregnatedCopperOxideCatalyst = new Material.Builder(13023, SuSyUtility.susyId('impregnated_copper_oxide_catalyst')) .dust() - .components(CupricOxide, 1, Alumina, 1) + .components(CupricOxide * 1, Alumina * 1) .colorAverage() .build() PhilipsCatalyst = new Material.Builder(13024, SuSyUtility.susyId('philips_catalyst')) .dust() - .components(SiliconDioxide, 1, ChromiumTrioxide, 1) + .components(SiliconDioxide * 1, ChromiumTrioxide * 1) .colorAverage() .build() ZieglerNattaCatalyst = new Material.Builder(13025, SuSyUtility.susyId('ziegler_natta_catalyst')) .dust() - .components(Triethylaluminium, 1, TitaniumTetrachloride, 1) + .components(Triethylaluminium * 1, TitaniumTetrachloride * 1) .colorAverage() .build() HydrogenPeroxideSolution = new Material.Builder(13026, SuSyUtility.susyId('hydrogen_peroxide_solution')) .liquid() - .components(HydrogenPeroxide, 1, Water, 1) + .components(HydrogenPeroxide * 1, Water * 1) .colorAverage() .build() AmmoniumAcetateSolution = new Material.Builder(13027, SuSyUtility.susyId('ammonium_acetate_solution')) .liquid() - .components(Carbon, 2, Hydrogen, 7, Nitrogen, 1, Oxygen, 2, Water, 1) + .components(Carbon * 2, Hydrogen * 7, Nitrogen * 1, Oxygen * 2, Water * 1) .colorAverage() .build() TetramethylammoniumHydroxideSolution = new Material.Builder(13028, SuSyUtility.susyId('tetramethylammonium_hydroxide_solution')) .liquid() - .components(Methanol, 1, TetramethylammoniumHydroxide, 1) + .components(Methanol * 1, TetramethylammoniumHydroxide * 1) .colorAverage() .build() SodiumSulfiteSolution = new Material.Builder(13029, SuSyUtility.susyId('sodium_sulfite_solution')) .liquid() - .components(SodiumSulfite, 1, Water, 1) + .components(SodiumSulfite * 1, Water * 1) .colorAverage() .build() PhosphorusSolution = new Material.Builder(13030, SuSyUtility.susyId('phosphorus_solution')) .liquid() - .components(PhosphorusTrichloride, 1, Phosphorus, 1) + .components(PhosphorusTrichloride * 1, Phosphorus * 1) .colorAverage() .build() SodiumCyanideSolution = new Material.Builder(13031, SuSyUtility.susyId('sodium_cyanide_solution')) .liquid() - .components(SodiumCyanide, 1, Water, 2) + .components(SodiumCyanide * 1, Water * 2) .colorAverage() .build() BrominatedSulfurDioxide = new Material.Builder(13032, SuSyUtility.susyId('brominated_sulfur_dioxide')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 1, HydrobromicAcid, 2) + .components(SulfuricAcid * 1, HydrobromicAcid * 2) .colorAverage() .build() SodiumThiosulfateSolution = new Material.Builder(13033, SuSyUtility.susyId('sodium_thiosulfate_solution')) .liquid() - .components(SodiumThiosulfate, 1, Water, 1) + .components(SodiumThiosulfate * 1, Water * 1) .colorAverage() .build() @@ -249,31 +249,31 @@ public class SecondDegreeMaterials { DilutedIronIIIChlorideSolution = new Material.Builder(13038, SuSyUtility.susyId('diluted_iron_iii_chloride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Iron3Chloride, 1, Water, 3) + .components(Iron3Chloride * 1, Water * 3) .colorAverage() .build() ChloroauricAcidSolution = new Material.Builder(13039, SuSyUtility.susyId('chloroauric_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(ChloroauricAcid, 3, NitricAcid, 1, Water, 6) + .components(ChloroauricAcid * 3, NitricAcid * 1, Water * 6) .color(0xd69129) .build(); ZincChlorideSolution = new Material.Builder(13040, SuSyUtility.susyId('zinc_chloride_solution')) .liquid() - .components(ZincChloride, 1, Water, 1) + .components(ZincChloride * 1, Water * 1) .colorAverage() .build(); WohlwillElectrolyte = new Material.Builder(13041, SuSyUtility.susyId('wohlwill_electrolyte')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(ChloroauricAcid, 1, Water, 1, HydrogenChloride, 2) + .components(ChloroauricAcid * 1, Water * 1, HydrogenChloride * 2) .color(0xe8b833) .build(); SpentWohlwilElectrolyte = new Material.Builder(13042, SuSyUtility.susyId('spent_wohlwill_electrolyte')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(ChloroauricAcid, 1, Water, 1, HydrogenChloride, 2) + .components(ChloroauricAcid * 1, Water * 1, HydrogenChloride * 2) .color(0xfacd50) .build(); @@ -281,19 +281,19 @@ public class SecondDegreeMaterials { GoldOreSlurry = new Material.Builder(13043, SuSyUtility.susyId('gold_ore_slurry')) .liquid() - .components(GoldConcentrate, 4, Water, 6) + .components(GoldConcentrate * 4, Water * 6) .colorAverage() .build(); GoldEluent = new Material.Builder(13044, SuSyUtility.susyId('gold_eluent')) .liquid() - .components(SodiumCyanide, 1, SodiumHydroxide, 1, Water, 27) + .components(SodiumCyanide * 1, SodiumHydroxide * 1, Water * 27) .colorAverage() .build(); GoldEluteSolution = new Material.Builder(13045, SuSyUtility.susyId('gold_elute_solution')) .liquid() - .components(SodiumCyanide, 1, SodiumHydroxide, 1, Sodium, 27, Gold, 27, Carbon, 54, Nitrogen, 54, Water, 27) + .components(SodiumCyanide * 1, SodiumHydroxide * 1, Sodium * 27, Gold * 27, Carbon * 54, Nitrogen * 54, Water * 27) .color(0xbbcc64) .build(); @@ -301,61 +301,61 @@ public class SecondDegreeMaterials { PotassiumCarbonateSolution = new Material.Builder(13046, SuSyUtility.susyId('potassium_carbonate_solution')) .liquid() - .components(PotassiumCarbonate, 1, Water, 1) + .components(PotassiumCarbonate * 1, Water * 1) .colorAverage() .build() PotassiumSulfateSolution = new Material.Builder(13047, SuSyUtility.susyId('potassium_sulfate_solution')) .liquid() - .components(PotassiumSulfate, 1, Water, 1) + .components(PotassiumSulfate * 1, Water * 1) .colorAverage() .build() PhosphoriteSlurry = new Material.Builder(13048, SuSyUtility.susyId('phosphorite_slurry')) .liquid() - .components(Phosphorite, 2, Water, 1) + .components(Phosphorite * 2, Water * 1) .colorAverage() .build() DilutedHexafluorosilicicAcid = new Material.Builder(13049, SuSyUtility.susyId('diluted_hexafluorosilicic_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(HexafluorosilicicAcid, 1, Water, 8) + .components(HexafluorosilicicAcid * 1, Water * 8) .colorAverage() .build() LithiumSulfateSolution = new Material.Builder(13050, SuSyUtility.susyId('lithium_sulfate_solution')) .liquid() - .components(LithiumSulfate, 1, Water, 1) + .components(LithiumSulfate * 1, Water * 1) .colorAverage() .build() DilutedSodiumSulfateSolution = new Material.Builder(13051, SuSyUtility.susyId('diluted_sodium_sulfate_solution')) .liquid() - .components(SodiumSulfate, 1, Water, 2) + .components(SodiumSulfate * 1, Water * 2) .color(0x9191b3) .build() DilutedHydrofluoricAcid = new Material.Builder(13052, SuSyUtility.susyId('diluted_hydrofluoric_acid')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(HydrogenFluoride, 1, Water, 2) + .components(HydrogenFluoride * 1, Water * 2) .colorAverage() .build(); FluorideFusedBeryl = new Material.Builder(13053, SuSyUtility.susyId('fluoride_fused_beryl')) .dust() - .components(SodiumFluoroberyllate, 6, Alumina, 2, SiliconDioxide, 15) + .components(SodiumFluoroberyllate * 6, Alumina * 2, SiliconDioxide * 15) .color(0x424f3e) .build(); SodiumFluoroberyllateSolution = new Material.Builder(13054, SuSyUtility.susyId('sodium_fluoroberyllate_solution')) .liquid() - .components(SodiumFluoroberyllate, 1, Water, 1) + .components(SodiumFluoroberyllate * 1, Water * 1) .colorAverage() .build(); AmmoniumFluoroberyllateSolution = new Material.Builder(13055, SuSyUtility.susyId('ammonium_fluoroberyllate_solution')) .liquid() - .components(AmmoniumFluoroberyllate, 1, Water, 3) + .components(AmmoniumFluoroberyllate * 1, Water * 3) .colorAverage() .build(); @@ -363,19 +363,19 @@ public class SecondDegreeMaterials { AmmoniumFluorideSolution = new Material.Builder(13056, SuSyUtility.susyId('ammonium_fluoride_solution')) .liquid() - .components(AmmoniumFluoride, 1, Water, 1) + .components(AmmoniumFluoride * 1, Water * 1) .colorAverage() .build(); AlkaliFusedBeryl = new Material.Builder(13057, SuSyUtility.susyId('alkali_fused_beryl')) .dust() - .components(Emerald, 1, SodaAsh, 1) + .components(Emerald * 1, SodaAsh * 1) .colorAverage() .build(); AluminiumSulfateSolution = new Material.Builder(13058, SuSyUtility.susyId('aluminium_sulfate_solution')) .liquid() - .components(AluminiumSulfate, 1, Water, 6) + .components(AluminiumSulfate * 1, Water * 6) .colorAverage() .build(); @@ -383,66 +383,66 @@ public class SecondDegreeMaterials { CopperSulfateSolution = new Material.Builder(13060, SuSyUtility.susyId('copper_sulfate_solution')) .liquid() - .components(CopperSulfate, 1, Water, 1) + .components(CopperSulfate * 1, Water * 1) .color(0x2d3bcf) .build(); BariumChlorideSolution = new Material.Builder(13061, SuSyUtility.susyId('barium_chloride_solution')) .liquid() - .components(BariumChloride, 1, Water, 2) + .components(BariumChloride * 1, Water * 2) .colorAverage() .build(); DilutedSodiumSilicateSolution = new Material.Builder(13062, SuSyUtility.susyId('diluted_sodium_silicate_solution')) .liquid() - .components(SodiumSilicate, 1, Water, 4) + .components(SodiumSilicate * 1, Water * 4) .colorAverage() .build(); SodiumDichromateSolution = new Material.Builder(13063, SuSyUtility.susyId('sodium_dichromate_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SodiumDichromate, 1, Water, 1, SulfuricAcid, 1) + .components(SodiumDichromate * 1, Water * 1, SulfuricAcid * 1) .color(0xe0912f) .build(); ChromiumSodaMixture = new Material.Builder(13064, SuSyUtility.susyId('chromium_soda_mixture')) .dust() - .components(ChromiumIIIOxide, 1, SodaAsh, 1) + .components(ChromiumIIIOxide * 1, SodaAsh * 1) .build(); LeadChlorideSolution = new Material.Builder(13066, SuSyUtility.susyId('lead_chloride_solution')) .liquid(new FluidBuilder().temperature(343)) - .components(LeadChloride, 1, Water, 1) + .components(LeadChloride * 1, Water * 1) .colorAverage() .build(); AmmoniumSulfateSolution = new Material.Builder(13067, SuSyUtility.susyId('ammonium_sulfate_solution')) .liquid() - .components(AmmoniumSulfate, 1, Water, 1) + .components(AmmoniumSulfate * 1, Water * 1) .colorAverage() .build(); AmmoniumChromeAlumSolution = new Material.Builder(13068, SuSyUtility.susyId('ammonium_chrome_alum_solution')) .liquid() - .components(AmmoniumChromeAlum, 1, Water, 1) + .components(AmmoniumChromeAlum * 1, Water * 1) .color(0x7643a3) .build(); AgedAmmoniumChromeAlumSolution = new Material.Builder(13069, SuSyUtility.susyId('aged_ammonium_chrome_alum_solution')) .liquid() - .components(AmmoniumChromeAlum, 1, Water, 1) + .components(AmmoniumChromeAlum * 1, Water * 1) .color(0x7643a3) .build(); PurifiedAmmoniumChromeAlumSolution = new Material.Builder(13070, SuSyUtility.susyId('purified_ammonium_chrome_alum_solution')) .liquid() - .components(AmmoniumChromeAlum, 1, Water, 1) + .components(AmmoniumChromeAlum * 1, Water * 1) .color(0x7643a3) .build(); AmmoniumIronIISulfateSolution = new Material.Builder(13071, SuSyUtility.susyId('ammonium_iron_ii_sulfate_solution')) .liquid(new FluidBuilder().temperature(343)) - .components(AmmoniumIronIISulfate, 1, Water, 1) + .components(AmmoniumIronIISulfate * 1, Water * 1) .color(0x70cc6e) .build(); @@ -450,13 +450,13 @@ public class SecondDegreeMaterials { DilutedAmmoniumSulfateSolution = new Material.Builder(13075, SuSyUtility.susyId('diluted_ammonium_sulfate_solution')) .liquid() - .components(AmmoniumSulfate, 1, Water, 2) + .components(AmmoniumSulfate * 1, Water * 2) .colorAverage() .build(); AlluvialPlatinumMotherLiquor = new Material.Builder(13076, SuSyUtility.susyId('alluvial_platinum_mother_liquor')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Palladium, 1, Chlorine, 4, ZincChloride, 1, HydrogenChloride, 4, Water, 14) + .components(Hydrogen * 2, Palladium * 1, Chlorine * 4, ZincChloride * 1, HydrogenChloride * 4, Water * 14) .colorAverage() .build(); @@ -464,19 +464,19 @@ public class SecondDegreeMaterials { AmmoniacalSodiumBicarbonateSolution = new Material.Builder(13077, SuSyUtility.susyId('ammoniacal_sodium_bicarbonate_solution')) .liquid() - .components(AmmoniumChloride, 1, SodiumBicarbonate, 1, Water, 1) + .components(AmmoniumChloride * 1, SodiumBicarbonate * 1, Water * 1) .colorAverage() .build(); VeryDilutedSodiumSulfateSolution = new Material.Builder(13078, SuSyUtility.susyId('very_diluted_sodium_sulfate_solution')) .liquid() - .components(SodiumSulfate, 1, Water, 9) + .components(SodiumSulfate * 1, Water * 9) .colorAverage() .build() MolybdicAcidSolution = new Material.Builder(13079, SuSyUtility.susyId('molybdic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Molybdenum, 1, Oxygen, 4, HydrogenChloride, 1, Water, 1) + .components(Hydrogen * 2, Molybdenum * 1, Oxygen * 4, HydrogenChloride * 1, Water * 1) .colorAverage() .build() @@ -484,7 +484,7 @@ public class SecondDegreeMaterials { NeutralizedAmmoniumMolybdateSolution = new Material.Builder(13080, SuSyUtility.susyId('neutralized_ammonium_molybdate_solution')) .liquid() - .components(Nitrogen, 2, Hydrogen, 8, Molybdenum, 1, Oxygen, 4, AmmoniumChloride, 1, Water, 4) + .components(Nitrogen * 2, Hydrogen * 8, Molybdenum * 1, Oxygen * 4, AmmoniumChloride * 1, Water * 4) .colorAverage() .build() @@ -492,55 +492,55 @@ public class SecondDegreeMaterials { SublimatedMolybdenumTrioxide = new Material.Builder(13081, SuSyUtility.susyId('sublimated_molybdenum_trioxide')) .liquid() - .components(PurifiedMolybdenumTrioxide, 1, Air, 1) + .components(PurifiedMolybdenumTrioxide * 1, Air * 1) .colorAverage() .build() AmmoniumThiocyanateSolution = new Material.Builder(13082, SuSyUtility.susyId('ammonium_thiocyanate_solution')) .liquid() - .components(AmmoniumThiocyanate, 1, Water, 1) + .components(AmmoniumThiocyanate * 1, Water * 1) .colorAverage() .build(); TantalumFluorideSolution = new Material.Builder(13083, SuSyUtility.susyId('tantalum_fluoride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TantalumFluoride, 1, Water, 2) + .components(TantalumFluoride * 1, Water * 2) .colorAverage() .build(); AmmoniumPerrhenateSolution = new Material.Builder(13084, SuSyUtility.susyId('ammonium_perrhenate_solution')) .liquid() - .components(AmmoniumPerrhenate, 1, Water, 1) + .components(AmmoniumPerrhenate * 1, Water * 1) .colorAverage() .build(); AluminiumChlorideSolution = new Material.Builder(13085, SuSyUtility.susyId('aluminium_chloride_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(AluminiumChloride, 1, Water, 3) + .components(AluminiumChloride * 1, Water * 3) .colorAverage() .build(); DilutedSodiumSulfiteSolution = new Material.Builder(13086, SuSyUtility.susyId('diluted_sodium_sulfite_solution')) .liquid() - .components(SodiumSulfite, 1, Water, 14) + .components(SodiumSulfite * 1, Water * 14) .color(0x75745a) .build(); EGlass = new Material.Builder(13088, SuSyUtility.susyId('e_glass')) .dust().liquid(new FluidBuilder().temperature(2300)) - .components(SiliconDioxide, 6, Alumina, 1, BoronTrioxide, 1, Quicklime, 2) + .components(SiliconDioxide * 6, Alumina * 1, BoronTrioxide * 1, Quicklime * 2) .color(0x778f8b) .build(); AlluvialPalladiumMotherLiquor = new Material.Builder(13089, SuSyUtility.susyId('alluvial_palladium_mother_liquor')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(AmmoniumChloride, 2, ZincChloride, 1, HydrogenChloride, 4, Water, 16) + .components(AmmoniumChloride * 2, ZincChloride * 1, HydrogenChloride * 4, Water * 16) .colorAverage() .build(); AlluvialDivalentPalladiumSolution = new Material.Builder(13090, SuSyUtility.susyId('alluvial_divalent_palladium_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Hydrogen, 2, Palladium, 1, Chlorine, 4, ZincChloride, 1, HydrogenChloride, 4, Water, 14) + .components(Hydrogen * 2, Palladium * 1, Chlorine * 4, ZincChloride * 1, HydrogenChloride * 4, Water * 14) .colorAverage() .build(); @@ -548,94 +548,94 @@ public class SecondDegreeMaterials { PlatinumPrecursorSolution = new Material.Builder(13091, SuSyUtility.susyId('platinum_precursor_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(AmmoniumHexachloroplatinate, 1, PhosphoricAcid, 1) + .components(AmmoniumHexachloroplatinate * 1, PhosphoricAcid * 1) .colorAverage() .build(); SupportedPlatinum = new Material.Builder(13092, SuSyUtility.susyId('supported_platinum')) .dust() - .components(Alumina, 1, Platinum, 1, Chlorine, 4) + .components(Alumina * 1, Platinum * 1, Chlorine * 4) .flags(GENERATE_CATALYST_BED) .build() CrudeManganeseIISulfateSolution = new Material.Builder(13093, SuSyUtility.susyId('crude_manganese_ii_sulfate_solution')) .liquid() - .components(ManganeseIISulfate, 1, Water, 1) + .components(ManganeseIISulfate * 1, Water * 1) .colorAverage() .build() .setFormula('(?)(MnSO4)(H2O)', true) ManganeseIISulfateSolution = new Material.Builder(13094, SuSyUtility.susyId('manganese_ii_sulfate_solution')) .liquid() - .components(ManganeseIISulfate, 1, Water, 1) + .components(ManganeseIISulfate * 1, Water * 1) .colorAverage() .build() .setFormula('(MnSO4)(H2O)', true) DilutedZincChlorideSolution = new Material.Builder(13095, SuSyUtility.susyId("diluted_zinc_chloride_solution")) .liquid() - .components(ZincChloride, 1, Water, 2) + .components(ZincChloride * 1, Water * 2) .colorAverage() .build(); TrichlorosilaneSolution = new Material.Builder(13096, SuSyUtility.susyId("trichlorosilane_solution")) .liquid() - .components(Trichlorosilane, 1, Toluene, 6) + .components(Trichlorosilane * 1, Toluene * 6) .colorAverage() .build(); ImpureBariumSulfideSolution = new Material.Builder(13097, SuSyUtility.susyId("impure_barium_sulfide_solution")) .liquid() - .components(ImpureBariumSulfide, 1, Water, 1) + .components(ImpureBariumSulfide * 1, Water * 1) .colorAverage() .build(); ImpureStrontiumSulfideSlurry = new Material.Builder(13098, SuSyUtility.susyId("impure_strontium_sulfide_slurry")) .liquid() - .components(ImpureStrontiumSulfide, 1, Water, 1, SiliconDioxide, 1) + .components(ImpureStrontiumSulfide * 1, Water * 1, SiliconDioxide * 1) .colorAverage() .build(); DilutedSodiumCarbonateSolution = new Material.Builder(13099, SuSyUtility.susyId("diluted_sodium_carbonate_solution")) .liquid() - .components(SodaAsh, 1, Water, 3) + .components(SodaAsh * 1, Water * 3) .colorAverage() .build(); PalladiumOnCarbon = new Material.Builder(13100, SuSyUtility.susyId("palladium_on_carbon")) .dust() - .components(Palladium, 1, ActivatedCarbon, 4) + .components(Palladium * 1, ActivatedCarbon * 4) .colorAverage() .build(); ManganeseIIChlorideSolution = new Material.Builder(13101, SuSyUtility.susyId("manganese_ii_chloride_solution")) .liquid() - .components(ManganeseIIChloride, 1, Water, 3) + .components(ManganeseIIChloride * 1, Water * 3) .colorAverage() .build(); DilutedManganeseIIChlorideSolution = new Material.Builder(13102, SuSyUtility.susyId("diluted_manganese_ii_chloride_solution")) .liquid() - .components(ManganeseIIChloride, 1, Water, 6) + .components(ManganeseIIChloride * 1, Water * 6) .colorAverage() .build(); PalladiumPrecursorSolution = new Material.Builder(13103, SuSyUtility.susyId("palladium_precursor_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(PalladiumChloride, 1, PhosphoricAcid, 1) + .components(PalladiumChloride * 1, PhosphoricAcid * 1) .colorAverage() .build(); SupportedPalladium = new Material.Builder(13104, SuSyUtility.susyId("supported_palladium")) .dust() - .components(PalladiumChloride, 1, Alumina, 1) + .components(PalladiumChloride * 1, Alumina * 1) .flags(GENERATE_CATALYST_BED) .colorAverage() .build(); MixedCyanideSolution = new Material.Builder(13105, SuSyUtility.susyId("mixed_cyanide_solution")) .liquid() - .components(SodiumCyanide, 2, Hydrogen, 2, Carbon, 2, Nitrogen, 2, Water, 1) + .components(SodiumCyanide * 2, Hydrogen * 2, Carbon * 2, Nitrogen * 2, Water * 1) .colorAverage() .build(); @@ -643,50 +643,50 @@ public class SecondDegreeMaterials { ChlorinatedBeryl = new Material.Builder(13106, SuSyUtility.susyId('chlorinated_beryl')) .gas(new FluidBuilder().temperature(1100)) - .components(BerylliumChloride, 3, AluminiumChloride, 2, SiliconTetrachloride, 6, CarbonMonoxide, 18) + .components(BerylliumChloride * 3, AluminiumChloride * 2, SiliconTetrachloride * 6, CarbonMonoxide * 18) .colorAverage() .build(); SupportedMolybdenumVanadium = new Material.Builder(13107, SuSyUtility.susyId("supported_molybdenum_vanadium")) .dust() .flags(GENERATE_CATALYST_BED) - .components(MolybdenumTrioxide, 1, VanadiumPentoxide, 1, Alumina, 1) + .components(MolybdenumTrioxide * 1, VanadiumPentoxide * 1, Alumina * 1) .colorAverage() .build(); IndiumChlorideSolution = new Material.Builder(13108, SuSyUtility.susyId("indium_chloride_solution")) .liquid() - .components(IndiumChloride, 1, Water, 1) + .components(IndiumChloride * 1, Water * 1) .colorAverage() .build(); TelluriumLiquor = new Material.Builder(13109, SuSyUtility.susyId("tellurium_liquor")) .liquid() - .components(Hydrogen, 2, Tellurium, 1, Oxygen, 4, SodiumSulfate, 1, Water, 1) + .components(Hydrogen * 2, Tellurium * 1, Oxygen * 4, SodiumSulfate * 1, Water * 1) .color(0x97bfb5) .build(); CaesiumAluminaMixture = new Material.Builder(13110, SuSyUtility.susyId("caesium_alumina_mixture")) .dust() - .components(Caesium, 2, Oxygen, 1, Alumina, 1) + .components(Caesium * 2, Oxygen * 1, Alumina * 1) .color(0x776ed4) .build(); CaesiumChlorideSolution = new Material.Builder(13111, SuSyUtility.susyId("caesium_chloride_solution")) .liquid() - .components(CaesiumChloride, 2, Water, 3) + .components(CaesiumChloride * 2, Water * 3) .colorAverage() .build(); RubidiumHydroxideSolution = new Material.Builder(13112, SuSyUtility.susyId("rubidium_hydroxide_solution")) .liquid() - .components(RubidiumHydroxide, 1, Water, 4) + .components(RubidiumHydroxide * 1, Water * 4) .colorAverage() .build(); SodiumAlumSolution = new Material.Builder(13113, SuSyUtility.susyId("sodium_alum_solution")) .liquid() - .components(SodiumAlum, 1, Water, 4) + .components(SodiumAlum * 1, Water * 4) .colorAverage() .build(); } diff --git a/groovy/material/ThermodynamicsMaterials.groovy b/groovy/material/ThermodynamicsMaterials.groovy index 2e7419cfb..82f2bd439 100755 --- a/groovy/material/ThermodynamicsMaterials.groovy +++ b/groovy/material/ThermodynamicsMaterials.groovy @@ -27,14 +27,14 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("hot_hp_" + materialName.toString())) .gas(new FluidBuilder().temperature(323)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 1, SuSyUtility.susyId("hp_" + materialName.toString())) .gas() .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); @@ -42,7 +42,7 @@ class ThermodynamicsMaterials { new Material.Builder(id + 2, SuSyUtility.susyId("cold_hp_" + materialName.toString())) .gas(new FluidBuilder().temperature(223)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); } @@ -54,7 +54,7 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("liquid_" + materialName.toString())) .liquid(new FluidBuilder().temperature(boilingTemperature)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); } @@ -65,28 +65,28 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("hot_compressed_" + materialName.toString())) .gas(new FluidBuilder().temperature(323)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 1, SuSyUtility.susyId("compressed_" + materialName.toString())) .gas() .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 2, SuSyUtility.susyId("cold_compressed_" + materialName.toString())) .gas(new FluidBuilder().temperature(223)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 3, SuSyUtility.susyId("cold_" + materialName.toString())) .gas(new FluidBuilder().temperature(223)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); } @@ -97,7 +97,7 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("warm_" + materialName.toString())) .liquid(new FluidBuilder().temperature(303)) .color(color) - .components(materialName, 1) + .components(materialName) .flags(DISABLE_DECOMPOSITION) .build(); @@ -109,7 +109,7 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("hot_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 100)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); } @@ -120,56 +120,56 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("warm_dry_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 1, SuSyUtility.susyId("warm_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 2, SuSyUtility.susyId("warm_humid_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 3, SuSyUtility.susyId("dry_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material))) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 4, SuSyUtility.susyId("humid_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material))) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 5, SuSyUtility.susyId("cool_dry_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 6, SuSyUtility.susyId("cool_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); new Material.Builder(id + 7, SuSyUtility.susyId("cool_humid_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20)) .color(color) - .components(material, 1) + .components(material) .flags(DISABLE_DECOMPOSITION) .build(); } @@ -180,7 +180,7 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("high_purity_" + material.toString())) .gas(new FluidBuilder().temperature(determineTemperatureGas(material))) .color(color) - .components(material, 1) + .components(material) .build(); } @@ -190,7 +190,7 @@ class ThermodynamicsMaterials { new Material.Builder(id, SuSyUtility.susyId("high_purity_" + material.toString())) .liquid(new FluidBuilder().temperature(determineTemperatureLiquid(material))) .color(color) - .components(material, 1) + .components(material) .build(); } @@ -478,7 +478,7 @@ class ThermodynamicsMaterials { SupercriticalCarbonDioxide = new Material.Builder(22843, SuSyUtility.susyId('supercritical_carbon_dioxide')) .liquid(new FluidBuilder().temperature(373)) - .components(CarbonDioxide, 1) + .components(CarbonDioxide) .colorAverage() .build(); } diff --git a/groovy/material/ThirdDegreeMaterials.groovy b/groovy/material/ThirdDegreeMaterials.groovy index b89f0fb3f..0e1c75305 100755 --- a/groovy/material/ThirdDegreeMaterials.groovy +++ b/groovy/material/ThirdDegreeMaterials.groovy @@ -21,313 +21,313 @@ public class ThirdDegreeMaterials { DiethylEtherSolution = new Material.Builder(24000, SuSyUtility.susyId('diethyl_ether_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(material('diethyl_ether'), 1, SulfuricAcid, 1, Water, 1) + .components(material('diethyl_ether'), SulfuricAcid * 1, Water * 1) .colorAverage() .build(); LithiumSolution = new Material.Builder(24001, SuSyUtility.susyId('lithium_solution')) .liquid() - .components(Lithium, 2, material('diethyl_ether'), 1) + .components(Lithium * 2, material('diethyl_ether')) .colorAverage() .build(); DimethylacetamideSolution = new Material.Builder(24002, SuSyUtility.susyId('dimethylacetamide_solution')) .liquid() - .components(Dimethylacetamide, 1, Water, 1) + .components(Dimethylacetamide * 1, Water * 1) .colorAverage() .build(); FurfuralSolution = new Material.Builder(24003, SuSyUtility.susyId('furfural_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Furfural, 1, SulfuricAcid, 1, Water, 3) + .components(Furfural * 1, SulfuricAcid * 1, Water * 3) .colorAverage() .build(); WackerCatalystSolution = new Material.Builder(24004, SuSyUtility.susyId('wacker_catalyst_solution')) .liquid() - .components(WackerCatalyst, 1, Water, 1) + .components(WackerCatalyst * 1, Water * 1) .colorAverage() .build(); TwoEthylanthraquinoneSolution = new Material.Builder(24005, SuSyUtility.susyId('two_ethylanthraquinone_solution')) .liquid() - .components(TwoEthylanthraquinone, 1, HydrogenPeroxide, 3) + .components(TwoEthylanthraquinone * 1, HydrogenPeroxide * 3) .colorAverage() .build(); AcetamideSolution = new Material.Builder(24006, SuSyUtility.susyId('acetamide_solution')) .liquid() - .components(Butanone, 1, Acetamide, 1) + .components(Butanone * 1, Acetamide * 1) .colorAverage() .build(); HydrazineSolution = new Material.Builder(24007, SuSyUtility.susyId('hydrazine_solution')) .liquid() - .components(Hydrazine, 1, Ammonia, 2, Water, 4) + .components(Hydrazine * 1, Ammonia * 2, Water * 4) .colorAverage() .build(); LithiumHexafluorophosphateElectrolyte = new Material.Builder(24008, SuSyUtility.susyId("lithium_hexafluorophosphate_electrolyte")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(LithiumHexafluorophosphate, 1, EthyleneCarbonate, 1) + .components(LithiumHexafluorophosphate * 1, EthyleneCarbonate * 1) .colorAverage() .build(); TNTSlurry = new Material.Builder(24009, SuSyUtility.susyId('tnt_slurry')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TNT, 1, DilutedSulfuricAcid, 1) + .components(TNT * 1, DilutedSulfuricAcid * 1) .colorAverage() .build(); DilutedDiTertButylPeroxide = new Material.Builder(24010, SuSyUtility.susyId('diluted_di_tert_butyl_peroxide')) .liquid() - .components(DiTertButylPeroxide, 1, Water, 1) + .components(DiTertButylPeroxide * 1, Water * 1) .colorAverage() .build(); TetrasodiumEthylenediaminetetraacetateSolution = new Material.Builder(24011, SuSyUtility.susyId('tetrasodium_ethylenediaminetetraacetate_solution')) .liquid() - .components(TetrasodiumEthylenediaminetetraacetate, 1, Water, 4) + .components(TetrasodiumEthylenediaminetetraacetate * 1, Water * 4) .colorAverage() .build(); UreaSolution = new Material.Builder(24012, SuSyUtility.susyId('urea_solution')) .liquid() - .components(Urea, 1, Water, 1) + .components(Urea * 1, Water * 1) .colorAverage() .build() DiiodobenzeneSolution = new Material.Builder(24013, SuSyUtility.susyId('diiodobenzene_solution')) .liquid() - .components(Ethanol, 1, Diiodobenzene, 1) + .components(Ethanol * 1, Diiodobenzene * 1) .colorAverage() .build() ImpureFourFourOxydianiline = new Material.Builder(24014, SuSyUtility.susyId('impure_four_four_oxydianiline')) .liquid() - .components(Ethanol, 2, Water, 5, FourFourOxydianiline, 1, AmmoniumIodide, 4) + .components(Ethanol * 2, Water * 5, FourFourOxydianiline * 1, AmmoniumIodide * 4) .colorAverage() .build() EthyleneGlycolSolution = new Material.Builder(24015, SuSyUtility.susyId('ethylene_glycol_solution')) .liquid() - .components(EthyleneGlycol, 1, Water, 2, SodiumHydroxide, 3) + .components(EthyleneGlycol * 1, Water * 2, SodiumHydroxide * 3) .colorAverage() .build() TerephthalicAcidSlurry = new Material.Builder(24016, SuSyUtility.susyId('terephthalic_acid_slurry')) .liquid() - .components(AceticAcid, 1, Water, 1, TerephthalicAcid, 1) + .components(AceticAcid * 1, Water * 1, TerephthalicAcid * 1) .colorAverage() .build() CelluloseAcetateSolution = new Material.Builder(24017, SuSyUtility.susyId('cellulose_acetate_solution')) .liquid() - .components(Acetone, 1, CelluloseAcetate, 1) + .components(Acetone * 1, CelluloseAcetate * 1) .colorAverage() .build() TwoButanolSolution = new Material.Builder(24018, SuSyUtility.susyId('two_butanol_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(SulfuricAcid, 1, TwoButanol, 1) + .components(SulfuricAcid * 1, TwoButanol * 1) .colorAverage() .build() FourFourOxydianilineSlurry = new Material.Builder(24019, SuSyUtility.susyId('four_four_oxydianiline_slurry')) .liquid() - .components(FourFourOxydianiline, 1, Water, 5) + .components(FourFourOxydianiline * 1, Water * 5) .colorAverage() .build() DiglycolicAcidSolution = new Material.Builder(24020, SuSyUtility.susyId('diglycolic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(DiglycolicAcid, 1, AmmoniaSolution, 1, Ethanol, 1) + .components(DiglycolicAcid * 1, AmmoniaSolution * 1, Ethanol * 1) .colorAverage() .build() DiTwoEthylhexylPhosphoricAcidSolution = new Material.Builder(24021, SuSyUtility.susyId('di_two_ethylhexyl_phosphoric_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(DiTwoEthylhexylPhosphoricAcid, 1, Hexane, 1) + .components(DiTwoEthylhexylPhosphoricAcid * 1, Hexane * 1) .colorAverage() .build() DilutedChloroaceticAnhydride = new Material.Builder(24022, SuSyUtility.susyId('diluted_chloroacetic_anhydride')) .liquid() - .components(ChloroaceticAnhydride, 1, Pyridine, 1, Water, 1) + .components(ChloroaceticAnhydride * 1, Pyridine * 1, Water * 1) .colorAverage() .build() ZirconiumTetrachlorideTetrahydrofuranComplex = new Material.Builder(24023, SuSyUtility.susyId('zirconium_tetrachloride_tetrahydrofuran_complex')) .dust() - .components(ZirconiumTetrachloride, 1, Tetrahydrofuran, 2) + .components(ZirconiumTetrachloride * 1, Tetrahydrofuran * 2) .colorAverage() .build(); DilutedTwoEthylTwoHexenal = new Material.Builder(24024, SuSyUtility.susyId('diluted_two_ethyl_two_hexenal')) .liquid() - .components(TwoEthylTwoHexenal, 1, DilutedSodiumHydroxideSolution, 1) + .components(TwoEthylTwoHexenal * 1, DilutedSodiumHydroxideSolution * 1) .colorAverage() .build() PotassiumButylXanthateSolution = new Material.Builder(24025, SuSyUtility.susyId('potassium_butyl_xanthate_solution')) .liquid() - .components(PotassiumButylXanthate, 1, Water, 1) + .components(PotassiumButylXanthate * 1, Water * 1) .colorAverage() .build(); DilutedMethylIsobutylKetone = new Material.Builder(24026, SuSyUtility.susyId('diluted_methyl_isobutyl_ketone')) .liquid() - .components(MethylIsobutylKetone, 1, Water, 1) + .components(MethylIsobutylKetone * 1, Water * 1) .colorAverage() .build() DilutedTwoEthylhexylNitrate = new Material.Builder(24027, SuSyUtility.susyId('diluted_two_ethylhexyl_nitrate')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TwoEthylhexylNitrate, 1, Water, 1, SulfuricAcid, 1) + .components(TwoEthylhexylNitrate * 1, Water * 1, SulfuricAcid * 1) .colorAverage() .build(); HydratedMagnesiumChlorideGlycolate = new Material.Builder(24028, SuSyUtility.susyId('hydrated_magnesium_chloride_glycolate')) .liquid() - .components(MagnesiumChloride, 1, Water, 2, EthyleneGlycol, 3) + .components(MagnesiumChloride * 1, Water * 2, EthyleneGlycol * 3) .colorAverage() .build(); MagnesiumChlorideGlycolate = new Material.Builder(24029, SuSyUtility.susyId('magnesium_chloride_glycolate')) .liquid() - .components(MagnesiumChloride, 1, EthyleneGlycol, 3) + .components(MagnesiumChloride * 1, EthyleneGlycol * 3) .colorAverage() .build(); DilutedDiisopropylamine = new Material.Builder(24030, SuSyUtility.susyId('diluted_diisopropylamine')) .liquid() - .components(Diisopropylamine, 1, Water, 2) + .components(Diisopropylamine * 1, Water * 2) .colorAverage() .build() PerfluorooctanoicAcidMixture = new Material.Builder(24031, SuSyUtility.susyId('perfluorooctanoic_acid_mixture')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(PerfluorooctanoicAcid, 1, HydrofluoricAcid, 1) + .components(PerfluorooctanoicAcid * 1, HydrofluoricAcid * 1) .colorAverage() .build() FluorinatedSurfactantMixture = new Material.Builder(24032, SuSyUtility.susyId('fluorinated_surfactant_mixture')) .liquid() - .components(PerfluorooctanoicAcid, 1, Water, 1) + .components(PerfluorooctanoicAcid * 1, Water * 1) .colorAverage() .build(); SodiumEthylXanthateSolution = new Material.Builder(24033, SuSyUtility.susyId('sodium_ethyl_xanthate_solution')) .liquid() - .components(SodiumEthylXanthate, 1, Water, 1) + .components(SodiumEthylXanthate * 1, Water * 1) .colorAverage() .build(); PotassiumAmylXanthateSolution = new Material.Builder(24034, SuSyUtility.susyId('potassium_amyl_xanthate_solution')) .liquid() - .components(PotassiumAmylXanthate, 1, Water, 1) + .components(PotassiumAmylXanthate * 1, Water * 1) .colorAverage() .build(); SodiumIsobutylXanthateSolution = new Material.Builder(24035, SuSyUtility.susyId('sodium_isobutyl_xanthate_solution')) .liquid() - .components(SodiumIsobutylXanthate, 1, Water, 1) + .components(SodiumIsobutylXanthate * 1, Water * 1) .colorAverage() .build(); PotassiumIsopropylXanthateSolution = new Material.Builder(24036, SuSyUtility.susyId('potassium_isopropyl_xanthate_solution')) .liquid() - .components(PotassiumIsopropylXanthate, 1, Water, 1) + .components(PotassiumIsopropylXanthate * 1, Water * 1) .colorAverage() .build(); PotassiumEthylXanthateSolution = new Material.Builder(24037, SuSyUtility.susyId('potassium_ethyl_xanthate_solution')) .liquid() - .components(PotassiumEthylXanthate, 1, Water, 1) + .components(PotassiumEthylXanthate * 1, Water * 1) .colorAverage() .build(); AcidicTributylPhosphate = new Material.Builder(24038, SuSyUtility.susyId('acidic_tributyl_phosphate')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TributylPhosphate, 1, HydrogenChloride, 3) + .components(TributylPhosphate * 1, HydrogenChloride * 3) .colorAverage() .build(); PhosgeneSolution = new Material.Builder(24039, SuSyUtility.susyId('phosgene_solution')) .liquid() - .components(Phosgene, 1, Dichloromethane, 1) + .components(Phosgene * 1, Dichloromethane * 1) .colorAverage() .build(); TriethylamineSolution = new Material.Builder(24040, SuSyUtility.susyId('triethylamine_solution')) .liquid() - .components(Triethylamine, 1, Dichloromethane, 4) + .components(Triethylamine * 1, Dichloromethane * 4) .colorAverage() .build(); KaminskyCatalyst = new Material.Builder(24041, SuSyUtility.susyId('kaminsky_catalyst')) .dust() - .components(ZirconoceneDichloride, 1, Methylaluminoxane, 1) + .components(ZirconoceneDichloride * 1, Methylaluminoxane * 1) .colorAverage() .build(); TNPSlurry = new Material.Builder(24042, SuSyUtility.susyId('tnp_slurry')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(PicricAcid, 1, DilutedSulfuricAcid, 1) + .components(PicricAcid * 1, DilutedSulfuricAcid * 1) .colorAverage() .build(); IsophthaloylChlorideSolution = new Material.Builder(24043, SuSyUtility.susyId('isophthaloyl_chloride_solution')) .liquid() - .components(Dichloroethane, 1, IsophthaloylChloride, 1) + .components(Dichloroethane * 1, IsophthaloylChloride * 1) .colorAverage() .build(); IsophthalicAcidSlurry = new Material.Builder(24044, SuSyUtility.susyId('isophthalic_acid_slurry')) .liquid() - .components(Water, 1, Dichloroethane, 1, IsophthalicAcid, 1) + .components(Water * 1, Dichloroethane * 1, IsophthalicAcid * 1) .colorAverage() .build() DichloroethaneIsophthalicAcidSolution = new Material.Builder(24045, SuSyUtility.susyId('dichloroethane_isophthalic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Dichloroethane, 1, IsophthalicAcid, 1) + .components(Dichloroethane * 1, IsophthalicAcid * 1) .colorAverage() .build() TetrahydrofuranSolution = new Material.Builder(24046, SuSyUtility.susyId('tetrahydrofuran_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Tetrahydrofuran, 1, SulfuricAcid, 1, Water, 1) + .components(Tetrahydrofuran * 1, SulfuricAcid * 1, Water * 1) .colorAverage() .build() AcidicTriethylPhosphate = new Material.Builder(24047, SuSyUtility.susyId('acidic_triethyl_phosphate')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TriethylPhosphate, 1, HydrogenChloride, 3) + .components(TriethylPhosphate * 1, HydrogenChloride * 3) .color(0x4639ee) .build(); NickelIIBisacetylacetonateSolution = new Material.Builder(24048, SuSyUtility.susyId('nickel_ii_bisacetylacetonate_solution')) .liquid() - .components(NickelIIBisacetylacetonate, 1, SodiumNitrate, 2, Water, 2) + .components(NickelIIBisacetylacetonate * 1, SodiumNitrate * 2, Water * 2) .color(0x3e5051) .build(); ShellHigherOlefinCatalystSolution = new Material.Builder(24049, SuSyUtility.susyId('shell_higher_olefin_catalyst_solution')) .liquid() - .components(Nickel, 1, DiphenylphosphinoaceticAcid, 1, Cyclooctadiene, 2, EthyleneGlycol, 1) + .components(Nickel * 1, DiphenylphosphinoaceticAcid * 1, Cyclooctadiene * 2, EthyleneGlycol * 1) .color(0x9c1012) .build(); AcidicNitrobenzeneMixture = new Material.Builder(24050, SuSyUtility.susyId('acidic_nitrobenzene_mixture')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Nitrobenzene, 1, SulfuricAcid, 1, Water, 1) + .components(Nitrobenzene * 1, SulfuricAcid * 1, Water * 1) .colorAverage() .build(); DichlorobistriphenylphosphinenickelII = new Material.Builder(24051, SuSyUtility.susyId('dichlorobistriphenylphosphinenickel_ii')) .dust() - .components(Nickel, 1, Chlorine, 2, Triphenylphosphine, 2) + .components(Nickel * 1, Chlorine * 2, Triphenylphosphine * 2) .colorAverage() .build(); @@ -335,7 +335,7 @@ public class ThirdDegreeMaterials { DicarbonylbistriphenylphosphinenickelZero = new Material.Builder(24052, SuSyUtility.susyId('dicarbonylbistriphenylphosphinenickel_zero')) .dust() - .components(Nickel, 1, Carbon, 2, Oxygen, 2, Triphenylphosphine, 2) + .components(Nickel * 1, Carbon * 2, Oxygen * 2, Triphenylphosphine * 2) .colorAverage() .build(); @@ -343,87 +343,87 @@ public class ThirdDegreeMaterials { SodiumPhenoxideSolution = new Material.Builder(24053, SuSyUtility.susyId('sodium_phenoxide_solution')) .liquid() - .components(SodiumPhenoxide, 1, Water, 1) + .components(SodiumPhenoxide * 1, Water * 1) .colorAverage() .build(); WetEpoxy = new Material.Builder(24054, SuSyUtility.susyId('wet_epoxy')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(Epoxy, 1) + .components(Epoxy * 1) .color(0xa16f0d) .build(); TetrabromobisphenolASolution = new Material.Builder(24055, SuSyUtility.susyId('tetrabromobisphenol_a_solution')) .liquid() - .components(TetrabromobisphenolA, 1, Dichloroethane, 6) + .components(TetrabromobisphenolA * 1, Dichloroethane * 6) .colorAverage() .build(); EpoxyCuringMixture = new Material.Builder(24056, SuSyUtility.susyId('epoxy_curing_mixture')) .dust() - .components(Dicyandiamide, 1, TwoMethylimidazole, 1, PhthalicAnhydride, 1) + .components(Dicyandiamide * 1, TwoMethylimidazole * 1, PhthalicAnhydride * 1) .colorAverage() .build(); WetFlameRetardantEpoxy = new Material.Builder(24057, SuSyUtility.susyId('wet_flame_retardant_epoxy')) .dust() .flags(DISABLE_DECOMPOSITION) - .components(FlameRetardantEpoxy, 1) + .components(FlameRetardantEpoxy * 1) .color(0xa1530b) .build(); PropyleneOxideSolution = new Material.Builder(24058, SuSyUtility.susyId('propylene_oxide_solution')) .liquid() - .components(CalciumChloride, 1, PropyleneOxide, 2, Water, 2) + .components(CalciumChloride * 1, PropyleneOxide * 2, Water * 2) .colorAverage() .build(); OrthoParaXyleneMixture = new Material.Builder(24059, SuSyUtility.susyId('ortho_para_xylene_mixture')) .liquid() - .components(OrthoXylene, 60, ParaXylene, 40) + .components(OrthoXylene * 60, ParaXylene * 40) .colorAverage() .build(); HydrogenSilsesquioxanePhotoresist = new Material.Builder(24060, SuSyUtility.susyId('hydrogen_silsesquioxane_photoresist')) .liquid() - .components(HydrogenSilsesquioxane, 1, MethylIsobutylKetone, 99) + .components(HydrogenSilsesquioxane * 1, MethylIsobutylKetone * 99) .colorAverage() .build(); CrudeTerephthalicAcidSlurry = new Material.Builder(24061, SuSyUtility.susyId('crude_terephthalic_acid_slurry')) .liquid() - .components(AmocoTerephthalicAcid, 1, Water, 1) + .components(AmocoTerephthalicAcid * 1, Water * 1) .colorAverage() .build(); CrudeIsophthalicAcidSlurry = new Material.Builder(24062, SuSyUtility.susyId('crude_isophthalic_acid_slurry')) .liquid() - .components(AmocoIsophthalicAcid, 1, Water, 1) + .components(AmocoIsophthalicAcid * 1, Water * 1) .colorAverage() .build(); HydrogenatedTerephthalicAcidSlurry = new Material.Builder(24063, SuSyUtility.susyId('hydrogenated_terephthalic_acid_slurry')) .liquid() - .components(TerephthalicAcid, 1, Water, 1) + .components(TerephthalicAcid * 1, Water * 1) .colorAverage() .build(); HydrogenatedIsophthalicAcidSlurry = new Material.Builder(24064, SuSyUtility.susyId('hydrogenated_isophthalic_acid_slurry')) .liquid() - .components(IsophthalicAcid, 1, Water, 1) + .components(IsophthalicAcid * 1, Water * 1) .colorAverage() .build(); AmocoPurificationMotherLiquor = new Material.Builder(24065, SuSyUtility.susyId('amoco_purification_mother_liquor')) .liquid() - .components(MethylParaToluate, 1, Water, 100) + .components(MethylParaToluate * 1, Water * 100) .colorAverage() .build(); ParaToluateMixture = new Material.Builder(24066, SuSyUtility.susyId('para_toluate_mixture')) .liquid(new FluidBuilder().temperature(540)) - .components(Carbon, 9, Hydrogen, 8, Oxygen, 4, ParaToluicAcid, 1) + .components(Carbon * 9, Hydrogen * 8, Oxygen * 4, ParaToluicAcid * 1) .colorAverage() .build(); @@ -431,140 +431,140 @@ public class ThirdDegreeMaterials { CrudeDimethylTerephthalateSolution = new Material.Builder(24067, SuSyUtility.susyId('crude_dimethyl_terephthalate_solution')) .liquid() - .components(CrudeDimethylTerephthalate, 1, Methanol, 1) + .components(CrudeDimethylTerephthalate * 1, Methanol * 1) .colorAverage() .build(); TerephthalateMotherLiquor = new Material.Builder(24068, SuSyUtility.susyId('terephthalate_mother_liquor')) .liquid() - .components(CrudeDimethylTerephthalate, 1, Methanol, 2) + .components(CrudeDimethylTerephthalate * 1, Methanol * 2) .colorAverage() .build(); MethylParaToluateMixture = new Material.Builder(24069, SuSyUtility.susyId('methyl_para_toluate_mixture')) .liquid(new FluidBuilder().temperature(540)) - .components(MethylParaToluate, 1, DimethylTerephthalate, 1) + .components(MethylParaToluate * 1, DimethylTerephthalate * 1) .colorAverage() .build(); SodiumDodecylSulfateSolution = new Material.Builder(24070, SuSyUtility.susyId('sodium_dodecyl_sulfate_solution')) .liquid() - .components(SodiumDodecylSulfate, 1, Water, 2) + .components(SodiumDodecylSulfate * 1, Water * 2) .colorAverage() .build(); SodiumCyclopentadienideSolution = new Material.Builder(24071, SuSyUtility.susyId('sodium_cyclopentadienide_solution')) .liquid() - .components(Sodium, 1, Carbon, 5, Hydrogen, 5, Tetrahydrofuran, 1) + .components(Sodium * 1, Carbon * 5, Hydrogen * 5, Tetrahydrofuran * 1) .colorAverage() .build() .setFormula("(NaC5H5)(C4H8O)", true); MethylcyclopentadieneSolution = new Material.Builder(24072, SuSyUtility.susyId('methylcyclopentadiene_solution')) .liquid() - .components(Methylcyclopentadiene, 1, Tetrahydrofuran, 1, Salt, 2) + .components(Methylcyclopentadiene * 1, Tetrahydrofuran * 1, Salt * 2) .colorAverage() .build(); BismethylcyclopentadienylmanganeseSolution = new Material.Builder(24073, SuSyUtility.susyId('bismethylcyclopentadienylmanganese_solution')) .liquid() - .components(Bismethylcyclopentadienylmanganese, 1, Diglyme, 1, Salt, 2) + .components(Bismethylcyclopentadienylmanganese * 1, Diglyme * 1, Salt * 2) .colorAverage() .build(); DilutedNitromethane = new Material.Builder(24074, SuSyUtility.susyId('diluted_nitromethane')) .liquid() - .components(Nitromethane, 3, Water, 1) + .components(Nitromethane * 3, Water * 1) .colorAverage() .build(); EthyleneVinylAcetateSuspension = new Material.Builder(24075, SuSyUtility.susyId('ethylene_vinyl_acetate_suspension')) .liquid() - .components(EthyleneVinylAcetate, 1, Methanol, 1) + .components(EthyleneVinylAcetate * 1, Methanol * 1) .colorAverage() .build(); EthyleneIsobutyleneVinylAcetateSuspension = new Material.Builder(24076, SuSyUtility.susyId('ethylene_isobutylene_vinyl_acetate_suspension')) .liquid() - .components(EthyleneIsobutyleneVinylAcetate, 1, Methanol, 1) + .components(EthyleneIsobutyleneVinylAcetate * 1, Methanol * 1) .colorAverage() .build(); DewaxingSolvent = new Material.Builder(24077, SuSyUtility.susyId('dewaxing_solvent')) .liquid() - .components(Dichloroethane, 1, Dichloromethane, 1) + .components(Dichloroethane * 1, Dichloromethane * 1) .colorAverage() .build(); OlefinPolymerizationInitiator = new Material.Builder(24078, SuSyUtility.susyId('olefin_polymerization_initiator')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(NButanol, 1, BoronTrifluoride, 3) + .components(NButanol * 1, BoronTrifluoride * 3) .colorAverage() .build(); TrimelliticAcidSlurry = new Material.Builder(24079, SuSyUtility.susyId('trimellitic_acid_slurry')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TrimelliticAcid, 1, AceticAcid, 1, Water, 1) + .components(TrimelliticAcid * 1, AceticAcid * 1, Water * 1) .colorAverage() .build(); CalciumSalicylateSolution = new Material.Builder(24080, SuSyUtility.susyId('calcium_salicylate_solution')) .liquid() - .components(CalciumSalicylate, 1, DiethyleneGlycol, 1) + .components(CalciumSalicylate * 1, DiethyleneGlycol * 1) .colorAverage() .build(); AcidicTricresylPhosphate = new Material.Builder(24081, SuSyUtility.susyId('acidic_tricresyl_phosphate')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(TricresylPhosphate, 1, HydrogenChloride, 3) + .components(TricresylPhosphate * 1, HydrogenChloride * 3) .colorAverage() .build(); ChloroaceticAcidSolution = new Material.Builder(24082, SuSyUtility.susyId('chloroacetic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(ChloroaceticAcid, 1, SulfuricAcid, 2) + .components(ChloroaceticAcid * 1, SulfuricAcid * 2) .colorAverage() .build(); OrthoPhenylenediamineSlurry = new Material.Builder(24083, SuSyUtility.susyId('ortho_phenylenediamine_slurry')) .liquid() - .components(OrthoPhenylenediamine, 1, Toluene, 1, Water, 2) + .components(OrthoPhenylenediamine * 1, Toluene * 1, Water * 2) .colorAverage() .build(); NomexPolymerizationMix = new Material.Builder(24085, SuSyUtility.susyId('nomex_polymerization_mix')) .liquid() - .components(Nomex, 1, CalciumChloride, 1, Dimethylacetamide, 4) + .components(Nomex * 1, CalciumChloride * 1, Dimethylacetamide * 4) .colorAverage() .build(); KevlarPolymerizationMix = new Material.Builder(24086, SuSyUtility.susyId('kevlar_polymerization_mix')) .liquid() - .components(Kevlar, 1, CalciumChloride, 1, Dimethylacetamide, 4) + .components(Kevlar * 1, CalciumChloride * 1, Dimethylacetamide * 4) .colorAverage() .build(); SpentDimethylacetamide = new Material.Builder(24087, SuSyUtility.susyId('spent_dimethylacetamide')) .liquid() - .components(CalciumChloride, 1, Dimethylacetamide, 4) + .components(CalciumChloride * 1, Dimethylacetamide * 4) .colorAverage() .build(); SodiumCelluloseXanthateSolution = new Material.Builder(24088, SuSyUtility.susyId('sodium_cellulose_xanthate_solution')) .liquid() - .components(SodiumCelluloseXanthate, 1, SodiumHydroxide, 1, Water, 1) + .components(SodiumCelluloseXanthate * 1, SodiumHydroxide * 1, Water * 1) .colorAverage() .build(); CrotonaldehydeMixture = new Material.Builder(24089, SuSyUtility.susyId('crotonaldehyde_mixture')) .liquid() - .components(SodiumHydroxide, 1, Crotonaldehyde, 1) + .components(SodiumHydroxide * 1, Crotonaldehyde * 1) .colorAverage() .build(); GaseousMethacrylicAcidMixture = new Material.Builder(24090, SuSyUtility.susyId('gaseous_methacrylic_acid_mixture')) .gas(new FluidBuilder().temperature(434)) - .components(Carbon, 4, Hydrogen, 6, Oxygen, 1, MethacrylicAcid, 3, Water, 4) + .components(Carbon * 4, Hydrogen * 6, Oxygen * 1, MethacrylicAcid * 3, Water * 4) .colorAverage() .build(); @@ -572,49 +572,49 @@ public class ThirdDegreeMaterials { MethacrylicAcidSolution = new Material.Builder(24091, SuSyUtility.susyId('methacrylic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(MethacrylicAcid, 1, Water, 1) + .components(MethacrylicAcid * 1, Water * 1) .colorAverage() .build(); AcidicChlorodifluoromethane = new Material.Builder(24092, SuSyUtility.susyId('acidic_chlorodifluoromethane')) .gas(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Chlorodifluoromethane, 1, HydrogenChloride, 2) + .components(Chlorodifluoromethane * 1, HydrogenChloride * 2) .color(0xbd97c7) .build(); SaltyNMethylTwoPyrrolidone = new Material.Builder(24093, SuSyUtility.susyId('salty_n_methyl_two_pyrrolidone')) .liquid() - .components(NMethylTwoPyrrolidone, 1, Salt, 1) + .components(NMethylTwoPyrrolidone * 1, Salt * 1) .colorAverage() .build(); DilutedNMethylTwoPyrrolidone = new Material.Builder(24094, SuSyUtility.susyId('diluted_n_methyl_two_pyrrolidone')) .liquid() - .components(NMethylTwoPyrrolidone, 1, Water, 1) + .components(NMethylTwoPyrrolidone * 1, Water * 1) .colorAverage() .build(); DilutedButyllithium = new Material.Builder(24095, SuSyUtility.susyId('diluted_butyllithium')) .liquid() - .components(Butyllithium, 1, DiethylEther, 1) + .components(Butyllithium * 1, DiethylEther * 1) .colorAverage() .build(); SpentPBISolution = new Material.Builder(24096, SuSyUtility.susyId('spent_pbi_solution')) .liquid() - .components(Dimethylacetamide, 1) + .components(Dimethylacetamide * 1) .colorAverage() .build(); OxalicAcidSolution = new Material.Builder(24097, SuSyUtility.susyId('oxalic_acid_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(OxalicAcid, 1, Water, 1) + .components(OxalicAcid * 1, Water * 1) .colorAverage() .build(); GalliumSulfateSolution = new Material.Builder(24098, SuSyUtility.susyId('gallium_sulfate_solution')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(Gallium, 2, Sulfur, 3, Oxygen, 12, OxalicAcid, 6, Water, 3) + .components(Gallium * 2, Sulfur * 3, Oxygen * 12, OxalicAcid * 6, Water * 3) .colorAverage() .build(); @@ -622,7 +622,7 @@ public class ThirdDegreeMaterials { FormicAcidWaterAzeotrope = new Material.Builder(24099, SuSyUtility.susyId('formic_acid_water_azeotrope')) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) - .components(FormicAcid, 6, Water, 4) + .components(FormicAcid * 6, Water * 4) .color(0xbf3983) .build(); } diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 65e66f265..afcd2769d 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -1,5 +1,5 @@ import globals.Globals -import globals.CarbonGlobals +import static globals.CarbonGlobals.* import static gregtech.api.unification.material.Materials.*; import gregtech.api.unification.material.MarkerMaterials; @@ -156,7 +156,7 @@ DISTILLERY.recipeBuilder() // Carbon Monoxide roaster // TODO: set output according to carbon amount? -for (carbon in CarbonGlobals.sources) { +for (carbon in sources) { ROASTER.recipeBuilder() .fluidInputs(fluid('oxygen') * 1000) .inputs(ore(carbon.name) * carbon.equivalent(1)) @@ -169,7 +169,7 @@ for (carbon in CarbonGlobals.sources) { // Carbon Dioxide roaster // TODO: set output according to carbon amount? -for (carbon in CarbonGlobals.sources) { +for (carbon in sources) { ROASTER.recipeBuilder() .fluidInputs(fluid('oxygen') * 2000) .inputs(ore(carbon.name) * carbon.equivalent(1)) @@ -182,7 +182,7 @@ for (carbon in CarbonGlobals.sources) { //CARBON DISULFIDE -for (carbon in CarbonGlobals.sources) { +for (carbon in sources) { ROASTER.recipeBuilder() .inputs(ore(carbon.name) * carbon.equivalent(1)) .inputs(ore('dustAnyPuritySulfur') * 2) @@ -1669,7 +1669,7 @@ DISTILLERY.recipeBuilder() //acetylene -for (carbon in CarbonGlobals.sources) { +for (carbon in sources) { ADVANCED_ARC_FURNACE.recipeBuilder() .inputs(ore('dustQuicklime') * 2) .inputs(ore(carbon.name) * carbon.equivalent(3)) @@ -2003,7 +2003,7 @@ ROASTER.recipeBuilder() //Silicon & Graphite -for (carbon in CarbonGlobals.dusts()) { +for (carbon in dusts()) { ARC_FURNACE.recipeBuilder() .inputs(ore('dustSiliconDioxide') * 3) .inputs(ore(carbon.name) * carbon.equivalent(2)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy index a1fe0bb23..e534cc4eb 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy @@ -1,4 +1,5 @@ import globals.Globals +import globals.CarbonGlobals import static globals.CarbonGlobals.* PRIMITIVEBLASTFURNACE = recipemap('primitive_blast_furnace') @@ -20,7 +21,7 @@ EBF.recipeBuilder() .duration(40) .buildAndRegister() -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { PRIMITIVEBLASTFURNACE.recipeBuilder() .inputs(ore('dustAnyPurityNickel')) .inputs(ore(combustible.name) * combustible.equivalent(1)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group12/ZincChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group12/ZincChain.groovy index 5702b4181..20513e867 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group12/ZincChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group12/ZincChain.groovy @@ -147,7 +147,7 @@ FLUIDIZEDBR.recipeBuilder() .buildAndRegister() // Conversion to metal via pyrometallurgy -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustZincite') * 2) .inputs(ore(combustible.name) * combustible.equivalent(1)) @@ -159,7 +159,7 @@ for (combustible in CarbonGlobals.combustibles()) { .buildAndRegister() } -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustZincOxide') * 2) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(1)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy index ad361a899..7702ff4e1 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/HafniumChain.groovy @@ -39,7 +39,7 @@ ROASTER.recipeBuilder() .duration(20) .buildAndRegister() -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { FLUIDIZED_BED_REACTOR.recipeBuilder() .inputs(ore('dustHafniumDioxide')) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(2)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy index a56444147..bf3f7249a 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/TitaniumChain.groovy @@ -120,7 +120,7 @@ BR.recipeBuilder() // Chloride Ilmenite Process -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { FLUIDIZED_BED_REACTOR.recipeBuilder() .fluidInputs(fluid('chlorine') * 3000) .inputs(ore('dustIlmenite')) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/ZirconiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/ZirconiumChain.groovy index 0185f6b97..708f1520c 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/ZirconiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group4/ZirconiumChain.groovy @@ -82,7 +82,7 @@ ADVANCED_ARC_FURNACE.recipeBuilder() .buildAndRegister() // Carbochlorination (100%) -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { FLUIDIZED_BED_REACTOR.recipeBuilder() .inputs(ore('dustConcentrateZircon')) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(4)) @@ -143,7 +143,7 @@ BR.recipeBuilder() .buildAndRegister() // Carbochlorination (100%) -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { FLUIDIZED_BED_REACTOR.recipeBuilder() .inputs(ore('dustBaddeleyite')) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(2)) @@ -203,7 +203,7 @@ BR.recipeBuilder() .duration(20) .buildAndRegister() -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { FLUIDIZED_BED_REACTOR.recipeBuilder() .inputs(ore('dustZirconiumDioxide')) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(2)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy index a10b598e2..3850af69f 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group7/ManganeseChain.groovy @@ -16,7 +16,7 @@ ELECTROLYTIC_CELL = recipemap('electrolytic_cell') //PYROMETALLUGRICAL METHODS (75%) -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { EBF.recipeBuilder() .inputs(ore('dustPyrolusite')) .inputs(ore(combustible.name) * combustible.equivalent(2)) @@ -37,7 +37,7 @@ ROASTER.recipeBuilder() .EUt(Globals.voltAmps[1]) .buildAndRegister() -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustManganeseIiOxide') * 2) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(1)) @@ -50,13 +50,14 @@ for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { } //PARTIAL REDUCTION OF PYROLUSITE FOR SULFURIC ACID LEACH -class Reductant { +// Should replace inner classes with closures if possible +class ReductantManganese { String name String byproduct int amount_required int byproduct_amount - Reductant(name, byproduct, amount_required, byproduct_amount) { + ReductantManganese(name, byproduct, amount_required, byproduct_amount) { this.name = name this.byproduct = byproduct this.amount_required = amount_required @@ -65,13 +66,13 @@ class Reductant { } def hydrocarbonReductants = [ - new Reductant('fuel_oil', 'carbon_dioxide', 67, 288), - new Reductant('natural_gas', 'carbon_dioxide', 167, 234) + new ReductantManganese('fuel_oil', 'carbon_dioxide', 67, 288), + new ReductantManganese('natural_gas', 'carbon_dioxide', 167, 234) ] def reductants = [ - new Reductant('carbon_monoxide', 'carbon_dioxide', 1000, 1000), - new Reductant('hydrogen', 'steam', 2000, 1000) + new ReductantManganese('carbon_monoxide', 'carbon_dioxide', 1000, 1000), + new ReductantManganese('hydrogen', 'steam', 2000, 1000) ] /* diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy index a230a26be..56abb5184 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group8/IronChain.groovy @@ -29,7 +29,8 @@ mods.gregtech.electric_blast_furnace.removeByInput(1920, [metaitem('dustIron') * mods.gregtech.electric_blast_furnace.removeByInput(1920, [metaitem('dustWroughtIron') * 4, metaitem('dustCarbon')], null) -class Blastable { +// Should replace inner classes with closures if possible +class BlastableIron { String name int amount_required int amount_produced @@ -37,7 +38,7 @@ class Blastable { int reductant_required int duration - Blastable(name, amount_required, amount_produced, reductant_required, duration) { + BlastableIron(name, amount_required, amount_produced, reductant_required, duration) { this.name = name this.amount_required = amount_required this.amount_produced = amount_produced @@ -46,12 +47,13 @@ class Blastable { } } -class Reductant { +// Should replace inner classes with closures if possible +class ReductantIron { String name String byproduct int amount_required int byproduct_amount - Reductant(name, byproduct, amount_required, byproduct_amount) { + ReductantIron(name, byproduct, amount_required, byproduct_amount) { this.name = name this.byproduct = byproduct this.amount_required = 1000 * amount_required @@ -63,27 +65,27 @@ def PBF_RECIPES = recipemap("primitive_blast_furnace") def EBF_RECIPES = recipemap("electric_blast_furnace") def blastables = [ - new Blastable('dustMagnetite', 2, 6, 4, 80), - new Blastable('dustBandedIron', 2, 4, 3, 80), - new Blastable('dustHematite', 2, 4, 3, 80), - new Blastable('dustIronIiiOxide', 5, 2, 3, 20), - new Blastable('dustIronIiOxide', 2, 1, 1, 20), - new Blastable('dustGraniticMineralSand', 2, 6, 4, 80), - new Blastable('oreIron', 2, 2, 2, 60), - new Blastable('oreMagnetite', 1, 3, 4, 60), - new Blastable('oreBandedIron', 1, 2, 3, 60), - new Blastable('oreNetherrackMagnetite', 1, 6, 4, 60), - new Blastable('oreNetherrackBandedIron', 1, 4, 3, 60), - new Blastable('oreEndstoneMagnetite', 1, 6, 4, 60), - new Blastable('oreEndstoneBandedIron', 1, 4, 3, 60) + new BlastableIron('dustMagnetite', 2, 6, 4, 80), + new BlastableIron('dustBandedIron', 2, 4, 3, 80), + new BlastableIron('dustHematite', 2, 4, 3, 80), + new BlastableIron('dustIronIiiOxide', 5, 2, 3, 20), + new BlastableIron('dustIronIiOxide', 2, 1, 1, 20), + new BlastableIron('dustGraniticMineralSand', 2, 6, 4, 80), + new BlastableIron('oreIron', 2, 2, 2, 60), + new BlastableIron('oreMagnetite', 1, 3, 4, 60), + new BlastableIron('oreBandedIron', 1, 2, 3, 60), + new BlastableIron('oreNetherrackMagnetite', 1, 6, 4, 60), + new BlastableIron('oreNetherrackBandedIron', 1, 4, 3, 60), + new BlastableIron('oreEndstoneMagnetite', 1, 6, 4, 60), + new BlastableIron('oreEndstoneBandedIron', 1, 4, 3, 60) ] def reductants = [ - new Reductant('carbon_monoxide', 'carbon_dioxide', 1, 1), - new Reductant('hydrogen', 'steam', 2, 1) + new ReductantIron('carbon_monoxide', 'carbon_dioxide', 1, 1), + new ReductantIron('hydrogen', 'steam', 2, 1) ] -def combustibles = CarbonGlobals.combustibles() +def combustibles = combustibles() for (blastable in blastables) { for (combustible in combustibles) { diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy index 81eb5b65c..b88ae6c9b 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group9/CobaltChain.groovy @@ -3,7 +3,7 @@ import static globals.CarbonGlobals.* ROASTER = recipemap('roaster') -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustCobaltOxide') * 2) .inputs(ore(combustible.name) * combustible.equivalent(1)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy index 6135fa21d..1e4841773 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/LeadChain.groovy @@ -162,7 +162,7 @@ for (fuel in rotary_kiln_fuels) { } //SINTER-ROAST PROCESS (UNIVERSAL, 200%) -def combustibles = CarbonGlobals.combustibles() +def combustibles = combustibles() for (combustible in combustibles) { EBF.recipeBuilder() @@ -295,7 +295,7 @@ BR.recipeBuilder() .duration(200) .buildAndRegister() -for (carbon in CarbonGlobals.sources) { +for (carbon in sources) { ROASTER.recipeBuilder() .inputs(ore('dustAntimonyVOxide') * 7) .inputs(ore(carbon.name) * carbon.equivalent(5)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy index 5f011cdbd..1047a0cff 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group14/TinChain.groovy @@ -70,7 +70,7 @@ CHEMICAL_BATH.recipeBuilder() .buildAndRegister() //SMELTING -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { REACTION_FURNACE.recipeBuilder() .inputs(ore('dustConcentrateCassiterite')) .inputs(ore(combustible.name) * combustible.equivalent(2)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/BismuthChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/BismuthChain.groovy index 54e5ccbcf..890f330e6 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/BismuthChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/BismuthChain.groovy @@ -17,7 +17,7 @@ ROASTER.recipeBuilder() .duration(120) .buildAndRegister() -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustBismuthIiiOxide') * 5) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(3)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/CaesiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/CaesiumChain.groovy index 7e70dc7b0..bc84074ac 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/CaesiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group1/CaesiumChain.groovy @@ -77,7 +77,7 @@ CRYSTALLIZER.recipeBuilder() // Refining into metal -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { ROASTER.recipeBuilder() .inputs(ore('dustCaesiumAlum') * 24) .inputs(ore(highPurityCombustible.name) * highPurityCombustible.equivalent(2)) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy index 78c60767f..372ca8cdc 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/s_block/group2/MagnesiumChain.groovy @@ -49,7 +49,7 @@ EBF.recipeBuilder() .blastFurnaceTemp(1370) .buildAndRegister() -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { EBF.recipeBuilder() .inputs(ore('dustMagnesia') * 2) .inputs(ore(combustible.name) * combustible.equivalent(1)) @@ -71,7 +71,7 @@ ROASTER.recipeBuilder() .buildAndRegister() //IG FARBEN CHLORINATION -for (combustible in CarbonGlobals.combustibles()) { +for (combustible in combustibles()) { REACTION_FURNACE.recipeBuilder() .inputs(ore('dustMagnesia') * 2) .inputs(ore(combustible.name) * combustible.equivalent(1)) diff --git a/groovy/postInit/chemistry/organic_chemistry/CoalPyrolysisChain.groovy b/groovy/postInit/chemistry/organic_chemistry/CoalPyrolysisChain.groovy index 693c34043..5f8e01116 100755 --- a/groovy/postInit/chemistry/organic_chemistry/CoalPyrolysisChain.groovy +++ b/groovy/postInit/chemistry/organic_chemistry/CoalPyrolysisChain.groovy @@ -13,9 +13,9 @@ def MIXER = recipemap('mixer'); def CSTR = recipemap('continuous_stirred_tank_reactor'); def DISTILLERY = recipemap('distillery'); -CarbonGlobals.byNames(['dustCoal', 'gemCoal', 'dustCharcoal', 'gemCharcoal']).each { input -> +byNames(['dustCoal', 'gemCoal', 'dustCharcoal', 'gemCharcoal']).each { input -> int CARBON_PROCESSED = 1200 - def output = CarbonGlobals.byName(input.pyrolysis_product) + def output = byName(input.pyrolysis_product) PYROLYSE_OVEN.recipeBuilder() .inputs(ore(input.name) * input.num_items_by_carbon(CARBON_PROCESSED)) .outputs(metaitem(output.name) * output.num_items_by_carbon(CARBON_PROCESSED)) @@ -26,9 +26,9 @@ CarbonGlobals.byNames(['dustCoal', 'gemCoal', 'dustCharcoal', 'gemCharcoal']).ea .buildAndRegister() } -CarbonGlobals.byNames(['dustAnthracite', 'gemAnthracite']).each { input -> +byNames(['dustAnthracite', 'gemAnthracite']).each { input -> int CARBON_PROCESSED = 1400 - def output = CarbonGlobals.byName(input.pyrolysis_product) + def output = byName(input.pyrolysis_product) PYROLYSE_OVEN.recipeBuilder() .inputs(ore(input.name) * input.num_items_by_carbon(CARBON_PROCESSED)) .outputs(metaitem(output.name) * output.num_items_by_carbon(CARBON_PROCESSED)) @@ -39,9 +39,9 @@ CarbonGlobals.byNames(['dustAnthracite', 'gemAnthracite']).each { input -> .buildAndRegister() } -CarbonGlobals.byNames(['dustLignite', 'gemLignite']).each { input -> +byNames(['dustLignite', 'gemLignite']).each { input -> int CARBON_PROCESSED = 400 - def output = CarbonGlobals.byName(input.pyrolysis_product) + def output = byName(input.pyrolysis_product) PYROLYSE_OVEN.recipeBuilder() .inputs(ore(input.name) * input.num_items_by_carbon(CARBON_PROCESSED)) .outputs(metaitem(output.name) * output.num_items_by_carbon(CARBON_PROCESSED)) @@ -52,8 +52,8 @@ CarbonGlobals.byNames(['dustLignite', 'gemLignite']).each { input -> .buildAndRegister() } -CarbonGlobals.byNames(['dustCoke', 'gemCoke']).each { input -> - def output = CarbonGlobals.byName(input.pyrolysis_product) +byNames(['dustCoke', 'gemCoke']).each { input -> + def output = byName(input.pyrolysis_product) PYROLYSE_OVEN.recipeBuilder() .inputs(ore(input.name) * 16) .outputs(metaitem(output.name) * 12) @@ -64,8 +64,8 @@ CarbonGlobals.byNames(['dustCoke', 'gemCoke']).each { input -> .buildAndRegister() } -CarbonGlobals.byNames(['dustLigniteCoke', 'gemLigniteCoke']).each { input -> - def output = CarbonGlobals.byName(input.pyrolysis_product) +byNames(['dustLigniteCoke', 'gemLigniteCoke']).each { input -> + def output = byName(input.pyrolysis_product) PYROLYSE_OVEN.recipeBuilder() .inputs(ore(input.name) * 16) .outputs(metaitem(output.name) * 9) diff --git a/groovy/postInit/components/Batteries.groovy b/groovy/postInit/components/Batteries.groovy index 7a232c14f..bcb42cc9a 100644 --- a/groovy/postInit/components/Batteries.groovy +++ b/groovy/postInit/components/Batteries.groovy @@ -288,12 +288,12 @@ mods.gregtech.autoclave.removeByInput(320, [metaitem('dustLapotron') * 15], [flu mods.gregtech.autoclave.removeByInput(256, [metaitem('dustLapotron') * 15], [fluid('blue_steel') * 288]) mods.gregtech.autoclave.removeByInput(192, [metaitem('dustLapotron') * 15], [fluid('red_steel') * 72]) -mods.jei.removeAndHide(metaitem('energy_crystal')); -mods.jei.removeAndHide(metaitem('lapotron_crystal')); - -mods.jei.removeAndHide(metaitem('energy.lapotronic_orb')); -mods.jei.removeAndHide(metaitem('energy.lapotronic_orb_cluster')); -mods.jei.removeAndHide(metaitem('energy.module')); -mods.jei.removeAndHide(metaitem('energy.cluster')); -mods.jei.removeAndHide(metaitem('max.battery')); +mods.jei.ingredient.removeAndHide(metaitem('energy_crystal')); +mods.jei.ingredient.removeAndHide(metaitem('lapotron_crystal')); + +mods.jei.ingredient.removeAndHide(metaitem('energy.lapotronic_orb')); +mods.jei.ingredient.removeAndHide(metaitem('energy.lapotronic_orb_cluster')); +mods.jei.ingredient.removeAndHide(metaitem('energy.module')); +mods.jei.ingredient.removeAndHide(metaitem('energy.cluster')); +mods.jei.ingredient.removeAndHide(metaitem('max.battery')); diff --git a/groovy/postInit/gameplay/Ores.groovy b/groovy/postInit/gameplay/Ores.groovy index 1ccaebfdf..adc88b5f2 100644 --- a/groovy/postInit/gameplay/Ores.groovy +++ b/groovy/postInit/gameplay/Ores.groovy @@ -74,6 +74,6 @@ def RedundantOreRemovals = [ for (entry in RedundantOreRemovals) { for (item in entry.getMatchingStacks()) { - mods.jei.removeAndHide(item) + mods.jei.ingredient.removeAndHide(item) } } diff --git a/groovy/postInit/gameplay/vanilla.groovy b/groovy/postInit/gameplay/vanilla.groovy index 13ce228da..0c9c48aec 100755 --- a/groovy/postInit/gameplay/vanilla.groovy +++ b/groovy/postInit/gameplay/vanilla.groovy @@ -2,10 +2,10 @@ net.minecraft.init.Blocks.NETHERRACK.blockHardness = 3.0 //Remove Enchantments -mods.jei.hide(ore('bookEnchanted')); -mods.jei.hide(item('minecraft:enchanting_table')); +mods.jei.ingredient.hide(ore('bookEnchanted')); +mods.jei.ingredient.hide(item('minecraft:enchanting_table')); //Remove Potions -mods.jei.hide(item('minecraft:brewing_stand')); +mods.jei.ingredient.hide(item('minecraft:brewing_stand')); item('biomesoplenty:mudball').Item.setMaxStackSize(64) diff --git a/groovy/postInit/metallurgy/StainlessSteelChain.groovy b/groovy/postInit/metallurgy/StainlessSteelChain.groovy index 10e0dc414..b417ca4c4 100644 --- a/groovy/postInit/metallurgy/StainlessSteelChain.groovy +++ b/groovy/postInit/metallurgy/StainlessSteelChain.groovy @@ -79,7 +79,7 @@ EBF.recipeBuilder() // .EUt(Globals.voltAmps[3]) // .buildAndRegister() -for (highPurityCombustible in CarbonGlobals.highPurityCombustibles()) { +for (highPurityCombustible in highPurityCombustibles()) { EBF.recipeBuilder() .inputs(ore('dustSiliconDioxide') * 3) .inputs(ore('dustIron') * 3) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index b13a0fc2a..d78d2bfdc 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -1,5 +1,5 @@ import globals.Globals -import globals.GroovyUtils.* +import globals.GroovyUtils import gregtech.api.recipes.recipeproperties.RecipeProperty; import gregtech.api.recipes.RecipeBuilder; diff --git a/groovy/prePostInit/ModifyRecipeMaps.groovy b/groovy/prePostInit/ModifyRecipeMaps.groovy index 0c966c8c2..31ab514a7 100755 --- a/groovy/prePostInit/ModifyRecipeMaps.groovy +++ b/groovy/prePostInit/ModifyRecipeMaps.groovy @@ -7,19 +7,19 @@ import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.recipes.GTRecipeHandler.*; //Removed to make way for overhauls -removeAllRecipes(RecipeMaps.DISTILLERY_RECIPES); -removeAllRecipes(RecipeMaps.DISTILLATION_RECIPES); -removeAllRecipes(RecipeMaps.CRACKING_RECIPES); -removeAllRecipes(RecipeMaps.BREWING_RECIPES); -removeAllRecipes(RecipeMaps.CHEMICAL_RECIPES); -removeAllRecipes(RecipeMaps.LARGE_CHEMICAL_RECIPES); -removeAllRecipes(RecipeMaps.FERMENTING_RECIPES); -removeAllRecipes(RecipeMaps.PYROLYSE_RECIPES); -removeAllRecipes(RecipeMaps.IMPLOSION_RECIPES); -removeAllRecipes(RecipeMaps.LASER_ENGRAVER_RECIPES); -removeAllRecipes(GTFORecipeMaps.GREENHOUSE_RECIPES); -removeAllRecipes(RecipeMaps.VACUUM_RECIPES); -removeAllRecipes(RecipeMaps.ELECTROLYZER_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.DISTILLERY_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.DISTILLATION_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.CRACKING_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.BREWING_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.CHEMICAL_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.LARGE_CHEMICAL_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.FERMENTING_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.PYROLYSE_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.IMPLOSION_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.LASER_ENGRAVER_RECIPES); +GTRecipeHandler.removeAllRecipes(GTFORecipeMaps.GREENHOUSE_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.VACUUM_RECIPES); +GTRecipeHandler.removeAllRecipes(RecipeMaps.ELECTROLYZER_RECIPES); //Add mixer recipes to blender @@ -78,8 +78,6 @@ mods.gregtech.centrifuge.removeByInput(480, [metaitem('dustPlatinumGroupSludge') mods.gregtech.centrifuge.removeByInput(80, [item('minecraft:glowstone_dust') * 2], null) // Small Pile of Quartzite Dust * 1 mods.gregtech.centrifuge.removeByInput(120, [metaitem('dustStone')], null) -// Raw Rubber Pulp * 3 -mods.gregtech.centrifuge.removeByInput(5, [metaitem('rubber_drop')], null) // Sulfur Dust * 1 mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustCinnabar') * 2], null) // Aluminium Dust * 2 diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index 6ea6e359c..af375557a 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -136,7 +136,7 @@ def unify (ore, p) { ItemStack item = ore.getAt(i) if (item.getItem().getRegistryName().getNamespace() != Globals.mod_priority[pos]) { ore.remove(item) - mods.jei.hide(item) + mods.jei.ingredient.hide(item) } } } else if (pos < Globals.mod_priority.size() - 1) { @@ -186,7 +186,7 @@ oreDictRemovals = [ oreDictRemovals.each { key, val -> ore(val).remove(item(key)) - mods.jei.hide(item(key)) + mods.jei.ingredient.hide(item(key)) } susycobble = SuSyBlocks.SUSY_STONE_BLOCKS.get(SusyStoneVariantBlock.StoneVariant.COBBLE) @@ -246,21 +246,21 @@ ore('dustCinnabar').remove(item('tardis:cinnabar')) ore('dustSaltpeter').remove(item('icbmclassic:saltpeter')) //Hide ALL TechGuns recipes, they are impossible anyways since the machines needed are uncraftable -mods.jei.hideCategory('minecraft.brewing') -mods.jei.hideCategory('techguns.ammopress') -mods.jei.hideCategory('techguns.metalpress') -mods.jei.hideCategory('techguns.chemlab') -mods.jei.hideCategory('techguns.fabricator') -mods.jei.hideCategory('techguns.chargingstation') -mods.jei.hideCategory('techguns.reactionchamber') -mods.jei.hideCategory('techguns.oredrill') -mods.jei.hideCategory('techguns.blastfurnace') -mods.jei.hideCategory('techguns.grinder') -mods.jei.hideCategory('techguns.camobench') - -mods.jei.hideCategory('gregtech:combustion_generator') - -mods.jei.hideCategory('minecraft.anvil') +mods.jei.category.hideCategory('minecraft.brewing') +mods.jei.category.hideCategory('techguns.ammopress') +mods.jei.category.hideCategory('techguns.metalpress') +mods.jei.category.hideCategory('techguns.chemlab') +mods.jei.category.hideCategory('techguns.fabricator') +mods.jei.category.hideCategory('techguns.chargingstation') +mods.jei.category.hideCategory('techguns.reactionchamber') +mods.jei.category.hideCategory('techguns.oredrill') +mods.jei.category.hideCategory('techguns.blastfurnace') +mods.jei.category.hideCategory('techguns.grinder') +mods.jei.category.hideCategory('techguns.camobench') + +mods.jei.category.hideCategory('gregtech:combustion_generator') + +mods.jei.category.hideCategory('minecraft.anvil') //Dust oredicting elements = [ From f0fdf2ab7fa11f18ab1068f94f8dd4d1c6a95b8f Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Tue, 7 May 2024 23:45:03 +0800 Subject: [PATCH 2/2] update grs & ceu --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 06322b07d..8d1a02a11 100644 --- a/manifest.json +++ b/manifest.json @@ -157,7 +157,7 @@ }, { "projectID": 557242, - "fileID": 5121638, + "fileID": 5322654, "required": true }, { @@ -818,7 +818,7 @@ }, { "projectID": 687577, - "fileID": 5120928, + "fileID": 5219945, "required": true }, {