Merge pull request #989 from trainvoi/ultra-hv-rework

Ultra-HV lines rework
SymmetricDevs · Sep 12, 2024 · 2fbe646 · 2fbe646
2 parents 9f796e3 + bd866ed
commit 2fbe646
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 19 deletions.
diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy
@@ -693,5 +693,11 @@ public class SecondDegreeMaterials {
  .components(SodiumAlum * 1, Water * 4)
  .colorAverage()
  .build();
+
+ GalvanizedSteel = new Material.Builder(13114, SuSyUtility.susyId("galvanized_steel"))
+ .dust().flags(GENERATE_FINE_WIRE)
+ .components(Iron * 8, Zinc * 1)
+ .colorAverage()
+ .build();
  }
 }
diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -1253,6 +1253,7 @@ class SuSyMaterials {
  public static Material RubidiumHydroxideSolution;
  public static Material SodiumAlumSolution;
  public static Material OxidizedManganateSolution;
+ public static Material GalvanizedSteel;
 
  // Organic Chemistry Materials
 

diff --git a/groovy/postInit/metallurgy/GalvanizedSteel.groovy b/groovy/postInit/metallurgy/GalvanizedSteel.groovy
@@ -0,0 +1,11 @@
+import globals.Globals
+
+FLUID_SOLIDIFIER = recipemap('fluid_solidifier')
+
+FLUID_SOLIDIFIER.recipeBuilder()
+ .inputs(ore('wireFineSteel') * 8)
+ .fluidInputs(fluid('zinc') * 18)
+ .outputs(metaitem('wireFineGalvanizedSteel') * 8)
+ .duration(100)
+ .EUt(Globals.voltAmps[1])
+ .buildAndRegister()
diff --git a/groovy/postInit/mod/IndustrialRenewal.groovy b/groovy/postInit/mod/IndustrialRenewal.groovy
@@ -617,45 +617,59 @@ mods.gregtech.assembler.recipeBuilder()
  .duration(100)
  .EUt(Globals.voltAmps[1])
  .buildAndRegister()
+
 /* ULTRA-HV THINGS*/
 
+
+
+mods.jei.ingredient.yeet( // hide IR materials
+ metaitem('plateGalvanizedSteel'),
+ metaitem('foilGalvanizedSteel')
+)
+
 mods.gregtech.assembler.recipeBuilder()
- .inputs(metaitem('stickAnnealedCopper') * 4)
- .inputs(ore('plateSteel') * 2)
- .fluidInputs(fluid('borosilicate_glass') * 72)
- .outputs(item('industrialrenewal:isolator_hv') * 2)
- .duration(20)
+ .inputs(metaitem('stickSteel'))
+ .inputs(ore('plateSteel'))
+ .fluidInputs(fluid('glass') * 576)
+ .outputs(item('industrialrenewal:isolator_hv'))
+ .duration(200)
  .EUt(Globals.voltAmps[1])
  .buildAndRegister()
 
 mods.gregtech.assembler.recipeBuilder()
- .inputs(metaitem('wireGtSingleManganesePhosphide') * 4)
- .inputs(metaitem('wireFineSteel') * 64)
+ .inputs(metaitem('wireFineGalvanizedSteel') * 64)
+ .inputs(metaitem('wireFineGalvanizedSteel') * 64)
+ .inputs(metaitem('wireFineCopper') * 64)
+ .inputs(metaitem('wireFineCopper') * 64)
  .inputs(metaitem('plateWood') * 2 )
+ .inputs(metaitem('stickSteel'))
  .outputs(item('industrialrenewal:coil_hv') * 2)
- .duration(40)
+ .duration(800)
  .EUt(Globals.voltAmps[1])
  .buildAndRegister()
 
 mods.gregtech.assembler.recipeBuilder()
- .inputs(metaitem('wireGtSingleMagnesiumDiboride') * 4)
+ .inputs(metaitem('wireFineGalvanizedSteel') * 64)
+ .inputs(metaitem('wireFineGalvanizedSteel') * 64)
+ .inputs(metaitem('wireFineAluminium') * 64)
  .inputs(metaitem('wireFineAluminium') * 64)
  .inputs(metaitem('plateWood') * 2 )
+ .inputs(metaitem('stickSteel'))
  .outputs(item('industrialrenewal:coil_hv') * 8)
- .duration(20)
+ .duration(800)
  .EUt(Globals.voltAmps[1])
  .buildAndRegister()
 
 mods.gregtech.assembler.recipeBuilder()
-.inputs(ore('plateSteel') * 16)
-.inputs(metaitem('transformer.adjustable.lv'))
-.inputs(item('industrialrenewal:energy_level'))
-.inputs(item('gregtech:metal_casing', 4) * 8)
-.inputs(item('industrialrenewal:isolator_hv'))
-.outputs(item('industrialrenewal:transformer_hv'))
-.duration(200)
-.EUt(Globals.voltAmps[1])
-.buildAndRegister()
+ .inputs(ore('circuitLV') * 4)
+ .inputs(metaitem('transformer.adjustable.lv'))
+ .inputs(item('industrialrenewal:energy_level'))
+ .inputs(item('gregtech:metal_casing', 4) * 8)
+ .inputs(item('industrialrenewal:isolator_hv'))
+ .outputs(item('industrialrenewal:transformer_hv'))
+ .duration(800)
+ .EUt(Globals.voltAmps[1])
+ .buildAndRegister()
 /*
 
 ArrayList<String> name_removals = [

diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang
@@ -1975,6 +1975,7 @@ susy.material.potassium_manganate=Potassium Manganate
 susy.material.lead_free_solder=Lead-Free Solder
 susy.material.cryogenic_solder=Cryogenic Solder
 susy.material.oxidized_manganate_solution=Oxidized Manganate Solution
+susy.material.galvanized_steel=Galvanized Steel
 
 # Isotopes