Skip to content

Commit

Permalink
Merge pull request #1118 from WideMann/stuffadditions
Browse files Browse the repository at this point in the history
Superalloys
  • Loading branch information
bruberu authored Dec 1, 2024
2 parents 027c741 + a8d6e40 commit 55326f9
Show file tree
Hide file tree
Showing 5 changed files with 271 additions and 3 deletions.
75 changes: 74 additions & 1 deletion groovy/material/FirstDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -3434,11 +3434,84 @@ public class FirstDegreeMaterials {
.build()
.setFormula("(Ar)(H2O)", true)

ArgonHydrogenMixture = new Material.Builder(8628, SuSyUtility.susyId("argon_hydrogen_mixture"))
ArgonHydrogenMixture = new Material.Builder(8626, SuSyUtility.susyId("argon_hydrogen_mixture"))
.gas()
.components(Argon, Hydrogen * 4)
.color(0x20a291)
.build()
.setFormula("(Ar)(H)", true)

IncoloyTwenty = new Material.Builder(8627, SuSyUtility.susyId("incoloy_twenty"))
.ingot().liquid(new FluidBuilder().temperature(1675))
.iconSet(SHINY)
.components(Iron * 12, Nickel * 8, Chrome * 12, Manganese, Copper * 2, Niobium, Tantalum, Molybdenum * 2)
.colorAverage()
.flags(GENERATE_ROD, GENERATE_PLATE)
.build()

IncoloyEightTwoFive = new Material.Builder(8628, SuSyUtility.susyId("incoloy_eight_two_five"))
.ingot().liquid(new FluidBuilder().temperature(1675))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Iron * 9, Nickel * 16, Chrome * 7, Manganese, Copper * 2, Aluminium, Titanium, Molybdenum * 2)
.colorAverage()
.build()

IncoloyNineZeroEight = new Material.Builder(8629, SuSyUtility.susyId("incoloy_nine_zero_eight"))
.ingot().liquid(new FluidBuilder().temperature(1685))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Iron * 20, Nickel * 30, Cobalt, Chrome * 3, Aluminium, Titanium * 2, Tungsten, Niobium * 2)
.colorAverage()
.build()

ReneN = new Material.Builder(8630, SuSyUtility.susyId("rene"))
.ingot().liquid(new FluidBuilder().temperature(1780))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Nickel * 22, Cobalt * 4, Chrome * 3, Aluminium * 3, Tungsten * 2, Hafnium, Rhenium * 2, Tantalum * 3)
.colorAverage()
.build()

MonelFiveHundred = new Material.Builder(8631, SuSyUtility.susyId("monel"))
.ingot().liquid(new FluidBuilder().temperature(1625))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Nickel * 23, Manganese * 2, Copper * 10, Aluminium * 4, Titanium)
.colorAverage()
.build()

StelliteJ = new Material.Builder(8632, SuSyUtility.susyId("stellite_j"))
.ingot().liquid(new FluidBuilder().temperature(1575))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Iron * 2, Nickel * 2, Cobalt * 15, Chrome * 13, Manganese, Tungsten * 7)
.colorAverage()
.build()

StelliteSix = new Material.Builder(8633, SuSyUtility.susyId("stellite_six"))
.ingot().liquid(new FluidBuilder().temperature(1630))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Nickel, Cobalt * 24, Chrome * 10, Manganese, Tungsten * 3, Molybdenum)
.colorAverage()
.build()

HSLAEightyX = new Material.Builder(8634, SuSyUtility.susyId("hsla_eighty_x"))
.ingot().liquid(new FluidBuilder().temperature(1770))
.iconSet(SHINY)
.flags(GENERATE_PLATE, GENERATE_ROD)
.components(Iron * 39, Manganese)
.colorAverage()
.build()
.setFormula("Fe99Mn", true)

FoodGradeStainlessSteel = new Material.Builder(8635, SuSyUtility.susyId("food_grade_stainless_steel"))
.ingot().liquid(new FluidBuilder().temperature(1780))
.iconSet(SHINY)
.flags(GENERATE_ROD, GENERATE_PLATE, GENERATE_RING, GENERATE_LONG_ROD)
.components(Iron * 24, Nickel * 5, Chrome * 8, Manganese, Molybdenum * 2)
.colorAverage()
.build()
}
}
4 changes: 2 additions & 2 deletions groovy/material/SecondDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -714,14 +714,14 @@ public class SecondDegreeMaterials {
.build()
.setFormula("(Li2CO3)(H2O)", true);

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

AmmoniacalArgonHydrogenMixture = new Material.Builder(8627, SuSyUtility.susyId("ammoniacal_argon_hydrogen_mixture"))
AmmoniacalArgonHydrogenMixture = new Material.Builder(13118, SuSyUtility.susyId("ammoniacal_argon_hydrogen_mixture"))
.gas()
.components(Argon, Hydrogen * 4, Ammonia)
.colorAverage()
Expand Down
9 changes: 9 additions & 0 deletions groovy/material/SuSyMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,15 @@ class SuSyMaterials {
public static Material DriedGraphene;
public static Material MoistArgon;
public static Material ArgonHydrogenMixture;
public static Material IncoloyTwenty;
public static Material IncoloyEightTwoFive;
public static Material IncoloyNineZeroEight;
public static Material ReneN;
public static Material MonelFiveHundred;
public static Material StelliteJ;
public static Material StelliteSix;
public static Material HSLAEightyX;
public static Material FoodGradeStainlessSteel;

// HP Materials

Expand Down
176 changes: 176 additions & 0 deletions groovy/postInit/metallurgy/Superalloys.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
import globals.Globals

ABS = recipemap('alloy_blast_smelter')

ABS.recipeBuilder()
.circuitMeta(6)
.inputs(ore('dustIron') * 12)
.inputs(ore('dustNickel') * 8)
.inputs(ore('dustChrome') * 12)
.inputs(ore('dustManganese') * 1)
.inputs(ore('dustCopper') * 2)
.inputs(ore('dustNiobium') * 1)
.inputs(ore('dustTantalum') * 1)
.inputs(ore('dustMolybdenum') * 2)
.fluidOutputs(fluid('incoloy_twenty') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(6)
.inputs(ore('dustIron') * 9)
.inputs(ore('dustNickel') * 16)
.inputs(ore('dustChrome') * 7)
.inputs(ore('dustManganese') * 1)
.inputs(ore('dustCopper') * 2)
.inputs(ore('dustAluminium') * 1)
.inputs(ore('dustTitanium') * 1)
.inputs(ore('dustMolybdenum') * 2)
.fluidOutputs(fluid('incoloy_eight_two_five') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(7)
.inputs(ore('dustAluminium') * 1)
.inputs(ore('dustCobalt') * 1)
.inputs(ore('dustIron') * 20)
.inputs(ore('dustNickel') * 30)
.inputs(ore('dustChrome') * 3)
.inputs(ore('dustTitanium') * 2)
.inputs(ore('dustTungsten') * 1)
.inputs(ore('dustNiobium') * 2)
.fluidOutputs(fluid('incoloy_nine_zero_eight') * 8640)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(7)
.inputs(ore('dustAluminium') * 3)
.inputs(ore('dustCobalt') * 4)
.inputs(ore('dustNickel') * 22)
.inputs(ore('dustChrome') * 3)
.inputs(ore('dustTungsten') * 2)
.inputs(ore('dustHafnium') * 1)
.inputs(ore('dustRhenium') * 2)
.inputs(ore('dustTantalum') * 3)
.fluidOutputs(fluid('rene') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(5)
.inputs(ore('dustNickel') * 23)
.inputs(ore('dustManganese') * 2)
.inputs(ore('dustCopper') * 10)
.inputs(ore('dustAluminium') * 4)
.inputs(ore('dustTitanium') * 1)
.fluidOutputs(fluid('monel') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(8)
.inputs(ore('dustIron') * 2)
.inputs(ore('dustNickel') * 2)
.inputs(ore('dustCobalt') * 15)
.inputs(ore('dustChrome') * 13)
.inputs(ore('dustManganese') * 1)
.inputs(ore('dustTungsten') * 7)
.fluidOutputs(fluid('stellite_j') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(8)
.inputs(ore('dustNickel') * 1)
.inputs(ore('dustCobalt') * 24)
.inputs(ore('dustChrome') * 10)
.inputs(ore('dustManganese') * 1)
.inputs(ore('dustTungsten') * 3)
.inputs(ore('dustMolybdenum') * 1)
.fluidOutputs(fluid('stellite_six') * 5760)
.blastFurnaceTemp(3000)
.duration(4000)
.EUt(Globals.voltAmps[4])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(4)
.inputs(ore('dustIron') * 39)
.inputs(ore('dustManganese') * 1)
.fluidOutputs(fluid('hsla_eighty_x') * 5760)
.blastFurnaceTemp(2600)
.duration(3000)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

ABS.recipeBuilder()
.circuitMeta(5)
.inputs(ore('dustIron') * 24)
.inputs(ore('dustNickel') * 5)
.inputs(ore('dustChrome') * 8)
.inputs(ore('dustManganese') * 1)
.inputs(ore('dustMolybdenum') * 2)
.fluidOutputs(fluid('food_grade_stainless_steel') * 5760)
.blastFurnaceTemp(2600)
.duration(3000)
.EUt(Globals.voltAmps[3])
.buildAndRegister()

static def removeItemsOfAlloy(String itemCategory) {
mods.jei.ingredient.removeAndHide(metaitem('ingot' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('ingotHot' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dust' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dustSmall' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dustTiny' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('plate' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('stick' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('nugget' + itemCategory));
}

static def removeItemsOfAlloyNoRod(String itemCategory) {
mods.jei.ingredient.removeAndHide(metaitem('ingot' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('ingotHot' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dust' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dustSmall' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('dustTiny' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('plate' + itemCategory));
mods.jei.ingredient.removeAndHide(metaitem('nugget' + itemCategory));
}

removeItemsOfAlloy('HastelloyC276');
removeItemsOfAlloy('HastelloyX');
removeItemsOfAlloy('IncoloyMa956');
removeItemsOfAlloy('MaragingSteel300');
removeItemsOfAlloy('WatertightSteel');
removeItemsOfAlloyNoRod('Stellite100');
removeItemsOfAlloyNoRod('Zeron100');

mods.jei.ingredient.removeAndHide(metaitem('ingotHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('dustHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('dustSmallHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('dustTinyHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('plateHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('stickHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('nuggetHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('springHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('stickLongHslaSteel'));
mods.jei.ingredient.removeAndHide(metaitem('plateDoubleHslaSteel'));

/*
Blocks from GT superalloys need to be removed (block, frame, sheeted frame) and liquids
Recipes for GCYM casings need to be changed to use SuSy superalloys, currently they still have recipes with old ones
*/
10 changes: 10 additions & 0 deletions resources/langfiles/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1986,6 +1986,16 @@ susy.material.cryogenic_solder=Cryogenic Solder
susy.material.oxidized_manganate_solution=Oxidized Manganate Solution
susy.material.galvanized_steel=Galvanized Steel

susy.material.incoloy_twenty=Incoloy 20
susy.material.incoloy_eight_two_five=Incoloy 825
susy.material.incoloy_nine_zero_eight=Incoloy 908
susy.material.rene=Rene N5
susy.material.monel=Monel 500
susy.material.stellite_j=Stellite J
susy.material.stellite_six=Stellite 6
susy.material.hsla_eighty_x=HSLA 980X
susy.material.food_grade_stainless_steel=Food-Grade Stainless Steel

# Graphene Chain
susy.material.moist_argon=Moist Argon
susy.material.argon_hydrogen_mixture=Argon Hydrogen Mixture
Expand Down

0 comments on commit 55326f9

Please sign in to comment.