Skip to content

Commit

Permalink
Merge pull request #1169 from trexxet/nmc_so4
Browse files Browse the repository at this point in the history 
Split MnO into crude & clean ones; add NiSO4, CoSO4 & MnSO4
  • Loading branch information
@trexxet
trexxet authored Dec 20, 2024
2 parents 3407346 + ea4a36e commit a089ff6
Show file tree
Hide file tree
Showing 11 changed files with 301 additions and 86 deletions.
54 changes: 45 additions & 9 deletions groovy/material/FirstDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,6 @@ public class FirstDegreeMaterials {
.dust()
.components(Manganese, Oxygen)
.color(0x472400)
.iconSet(SAND)
.build()

RaneyCobalt = new Material.Builder(8266, SuSyUtility.susyId('raney_cobalt'))
Expand Down Expand Up @@ -2010,7 +2009,7 @@ public class FirstDegreeMaterials {
.dust()
.iconSet('SHINY')
.components(Manganese, Oxygen * 2)
.colorAverage()
.color(0x38251e)
.build()

BariumTitanate = new Material.Builder(8396, SuSyUtility.susyId('barium_titanate'))
Expand Down Expand Up @@ -2548,7 +2547,13 @@ public class FirstDegreeMaterials {

AmmoniumDihydrogenPhosphate.setFormula("NH4H2PO4", true)

//FREE ID: 8474
CrudeManganeseIIOxide = new Material.Builder(8474, SuSyUtility.susyId('crude_manganese_ii_oxide'))
.dust()
.components(Manganese, Oxygen)
.color(0x472400)
.iconSet(SAND)
.build()
.setFormula("(?)(MnO)", true)

IronCarbonate = new Material.Builder(8475, SuSyUtility.susyId('iron_carbonate'))
.dust()
Expand Down Expand Up @@ -2589,8 +2594,22 @@ public class FirstDegreeMaterials {
.components(Carbon)
.flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE)
.build();

//FREE IDs: 8482-8485

ManganeseIINitrateSolution = new Material.Builder(8482, SuSyUtility.susyId('manganese_ii_nitrate_solution'))
.liquid()
.components(Manganese, Nitrogen * 2, Oxygen * 6, Water)
.colorAverage()
.build()
.setFormula("(Mn(NO3)2)(H2O)", true)

CrudeManganeseIINitrateSolution = new Material.Builder(8483, SuSyUtility.susyId('crude_manganese_ii_nitrate_solution'))
.liquid()
.components(Manganese, Nitrogen * 2, Oxygen * 6, Water)
.colorAverage()
.build()
.setFormula("(?)(Mn(NO3)2)(H2O)", true)

//FREE IDs: 8484-8485

UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry'))
.liquid()
Expand Down Expand Up @@ -2660,7 +2679,13 @@ public class FirstDegreeMaterials {
.color(0x887866)
.build();

//FREE IDs: 8496-8498
//FREE IDs: 8496-8497

NickelSulfate = new Material.Builder(8498, SuSyUtility.susyId('nickel_sulfate'))
.dust()
.components(Nickel * 1, Sulfur * 1, Oxygen * 4)
.color(0xcad3a7)
.build()

SodiumNitrite = new Material.Builder(8499, SuSyUtility.susyId('sodium_nitrite'))
.dust().liquid(new FluidBuilder().temperature(544))
Expand Down Expand Up @@ -2706,10 +2731,9 @@ public class FirstDegreeMaterials {

NickelSulfateSolution = new Material.Builder(8505, SuSyUtility.susyId('nickel_sulfate_solution'))
.liquid()
.components(Nickel, Sulfur, Oxygen * 4, Water)
.components(NickelSulfate, Water)
.color(0x38add1)
.build();
NickelSulfateSolution.setFormula("(NiSO4)(H2O)", true)

DisulfurDichloride = new Material.Builder(8506, SuSyUtility.susyId('disulfur_dichloride'))
.liquid()
Expand Down Expand Up @@ -2783,7 +2807,7 @@ public class FirstDegreeMaterials {
ManganeseIIHydroxide = new Material.Builder(8520, SuSyUtility.susyId('manganese_ii_hydroxide'))
.dust()
.components(Manganese, Oxygen * 2, Hydrogen * 2)
.colorAverage()
.color(0xe4cfb1)
.build();

ManganeseIIHydroxide.setFormula("Mn(OH)2", true)
Expand Down Expand Up @@ -3544,5 +3568,17 @@ public class FirstDegreeMaterials {
.components(Iron * 24, Nickel * 5, Chrome * 8, Manganese, Molybdenum * 2)
.colorAverage()
.build()

CobaltSulfate = new Material.Builder(8636, SuSyUtility.susyId('cobalt_sulfate'))
.dust()
.components(Cobalt * 1, Sulfur * 1, Oxygen * 4)
.color(0xbb7694)
.build()

CobaltSulfateSolution = new Material.Builder(8637, SuSyUtility.susyId('cobalt_sulfate_solution'))
.liquid()
.components(CobaltSulfate * 1, Water * 1)
.colorAverage()
.build()
}
}
6 changes: 6 additions & 0 deletions groovy/material/SuSyMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ class SuSyMaterials {
public static Material IronThioantimonite;
public static Material AntimonyIIISulfide;
public static Material IronThioarsenite;
public static Material CrudeManganeseIIOxide;
public static Material ManganeseIIOxide;
public static Material IronIIIHydroxide;
public static Material Cellulose;
Expand Down Expand Up @@ -963,6 +964,8 @@ class SuSyMaterials {
public static Material SodiumBismuthate;
public static Material BismuthIIIOxide;
public static Material ManganeseIINitrate;
public static Material ManganeseIINitrateSolution;
public static Material CrudeManganeseIINitrateSolution;
public static Material ManganeseDioxide;
public static Material BariumTitanate;
public static Material RawElectrum;
Expand Down Expand Up @@ -1044,6 +1047,7 @@ class SuSyMaterials {
public static Material SodiumHexachloroplatinateSolution;
public static Material AmmoniumHexachloroplatinate;
public static Material DilutedCopperSulfateSolution;
public static Material NickelSulfate;
public static Material NickelSulfateSolution;
public static Material AluminiumNitride;
public static Material AluminiumOxynitride;
Expand Down Expand Up @@ -1182,6 +1186,8 @@ class SuSyMaterials {
public static Material StelliteSix;
public static Material HSLAEightyX;
public static Material FoodGradeStainlessSteel;
public static Material CobaltSulfate;
public static Material CobaltSulfateSolution;

// HP Materials

Expand Down
17 changes: 10 additions & 7 deletions groovy/postInit/chemistry/inorganic_chemistry/Dyes.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ BR.recipeBuilder()
.duration(200)
.buildAndRegister()

MIXER.recipeBuilder()
.inputs(ore('dustManganeseIiOxide'))
.inputs(ore('dustIronIiiOxide'))
.outputs(metaitem('dustSienna') * 2)
.EUt(30)
.duration(200)
.buildAndRegister()
def mn_ii_oxides = ['dustManganeseIiOxide', 'dustCrudeManganeseIiOxide']
for (mn_ii_oxide in mn_ii_oxides) {
MIXER.recipeBuilder()
.inputs(ore(mn_ii_oxide))
.inputs(ore('dustIronIiiOxide'))
.outputs(metaitem('dustSienna') * 2)
.EUt(30)
.duration(200)
.buildAndRegister()
}

furnace.add(metaitem('dustSienna'), metaitem('dustBurntSienna'))

Expand Down
86 changes: 76 additions & 10 deletions groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/NickelChain.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ EBF = recipemap('electric_blast_furnace')
ROASTER = recipemap('roaster')
REACTION_FURNACE = recipemap('reaction_furnace')
BR = recipemap('batch_reactor')
DISTILLERY = recipemap('distillery')
MIXER = recipemap('mixer')

// Garnierite Dust * 1
mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustPentlandite')], [fluid('oxygen') * 3000])
Expand Down Expand Up @@ -58,16 +60,16 @@ for (combustible in combustibles()) {
}

ELECTROLYTIC_CELL.recipeBuilder()
.fluidInputs(fluid('nickel_sulfate_solution') * 1000)
.fluidInputs(fluid('water') * 2000)
.notConsumable(metaitem('stickNickel'))
.notConsumable(metaitem('graphite_electrode'))
.outputs(metaitem('dustNickel'))
.fluidOutputs(fluid('diluted_sulfuric_acid') * 2000)
.fluidOutputs(fluid('oxygen') * 1000)
.duration(240)
.EUt(Globals.voltAmps[2])
.buildAndRegister()
.fluidInputs(fluid('nickel_sulfate_solution') * 1000)
.fluidInputs(fluid('water') * 2000)
.notConsumable(metaitem('stickNickel'))
.notConsumable(metaitem('graphite_electrode'))
.outputs(metaitem('dustNickel'))
.fluidOutputs(fluid('diluted_sulfuric_acid') * 2000)
.fluidOutputs(fluid('oxygen') * 1000)
.duration(240)
.EUt(Globals.voltAmps[2])
.buildAndRegister()

//MOND PROCESS

Expand Down Expand Up @@ -96,3 +98,67 @@ REACTION_FURNACE.recipeBuilder()
.duration(40)
.buildAndRegister()

// NiCl2

ROASTER.recipeBuilder()
.inputs(ore('dustNickel') * 1)
.fluidInputs(fluid('chlorine') * 2000)
.outputs(metaitem('dustNickelChloride') * 3)
.duration(100)
.EUt(30)
.buildAndRegister()

// Ni(OH)2

BR.recipeBuilder()
.inputs(ore('dustNickelChloride') * 3)
.fluidInputs(fluid('potassium_hydroxide_solution') * 2000)
.outputs(metaitem('dustNickelHydroxide') * 5)
.fluidOutputs(fluid('potassium_chloride_solution') * 2000)
.duration(100)
.EUt(30)
.buildAndRegister()

// NiO

ROASTER.recipeBuilder()
.inputs(ore('dustNickel'))
.fluidInputs(fluid('oxygen') * 1000)
.outputs(metaitem('dustNickelIiOxide') * 2)
.duration(200)
.EUt(30)
.buildAndRegister()

ROASTER.recipeBuilder()
.inputs(ore('dustNickelHydroxide') * 5)
.outputs(metaitem('dustNickelIiOxide') * 2)
.fluidOutputs(fluid('dense_steam') * 1000)
.EUt(30)
.duration(200)
.buildAndRegister()

// NiSO4

BR.recipeBuilder()
.inputs(ore('dustNickelIiOxide') * 2)
.fluidInputs(fluid('sulfuric_acid') * 1000)
.fluidOutputs(fluid('nickel_sulfate_solution') * 1000)
.duration(80)
.EUt(30)
.buildAndRegister()

DISTILLERY.recipeBuilder()
.fluidInputs(fluid('nickel_sulfate_solution') * 1000)
.fluidOutputs(fluid('water') * 1000)
.outputs(metaitem('dustNickelSulfate') * 6)
.duration(80)
.EUt(30)
.buildAndRegister()

MIXER.recipeBuilder()
.inputs(ore('dustNickelSulfate') * 6)
.fluidInputs(fluid('water') * 1000)
.fluidOutputs(fluid('nickel_sulfate_solution') * 1000)
.duration(80)
.EUt(30)
.buildAndRegister()
8 changes: 0 additions & 8 deletions groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group5/NiobiumChain.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,3 @@ ROASTER.recipeBuilder()
.duration(80)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

MIXER.recipeBuilder()
.inputs(ore('dustManganeseIiSulfate') * 6)
.fluidInputs(fluid('water') * 1000)
.fluidOutputs(fluid('manganese_ii_sulfate_solution') * 1000)
.duration(160)
.EUt(Globals.voltAmps[1])
.buildAndRegister()
Loading

0 comments on commit a089ff6

Please sign in to comment.