From e306b1b7fd0a7bd515889735ce03c7aa6d691f68 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 21:09:00 +0700 Subject: [PATCH 1/6] galvanized square steel --- groovy/material/SecondDegreeMaterials.groovy | 6 +++ groovy/material/SuSyMaterials.groovy | 1 + .../metallurgy/GalvanizedSteel.groovy | 17 +++++++ groovy/postInit/mod/IndustrialRenewal.groovy | 50 ++++++++++++------- resources/langfiles/lang/en_us.lang | 1 + 5 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 groovy/postInit/metallurgy/GalvanizedSteel.groovy diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy index 9a10ee7ee..6a36d8f3a 100644 --- 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 index 5972933b8..b356fa442 100644 --- 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 new file mode 100644 index 000000000..311aec12d --- /dev/null +++ b/groovy/postInit/metallurgy/GalvanizedSteel.groovy @@ -0,0 +1,17 @@ +import globals.Globals +import static globals.CarbonGlobals.* + +import static gregtech.api.unification.material.Materials.*; +import gregtech.api.unification.material.MarkerMaterials; +import static gregtech.api.unification.ore.OrePrefix.dye; + + +FLUID_SOLIDIFIER = recipemap('fluid_solidifier') + +FLUID_SOLIDIFIER.recipeBuilder() + .inputs(ore('wireFineSteel') * 64) + .fluidInputs(fluid('zinc') * 144) + .outputs(metaitem('wireFineGalvanizedSteel') * 64) + .duration(800) + .EUt(Globals.voltAmps[1]) + .buildAndRegister() \ No newline at end of file diff --git a/groovy/postInit/mod/IndustrialRenewal.groovy b/groovy/postInit/mod/IndustrialRenewal.groovy index 282296082..f716d50b8 100755 --- 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(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 name_removals = [ diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 0ef625bf9..cd646b059 100644 --- 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 From fc823dd5e377e30a604789beb30c394788f21509 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 21:11:26 +0700 Subject: [PATCH 2/6] Update IndustrialRenewal.groovy --- groovy/postInit/mod/IndustrialRenewal.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/postInit/mod/IndustrialRenewal.groovy b/groovy/postInit/mod/IndustrialRenewal.groovy index f716d50b8..6b23fa3ca 100755 --- a/groovy/postInit/mod/IndustrialRenewal.groovy +++ b/groovy/postInit/mod/IndustrialRenewal.groovy @@ -628,7 +628,7 @@ mods.jei.ingredient.yeet( // hide IR materials ) mods.gregtech.assembler.recipeBuilder() - .inputs(metaitem('stickAnnealedCopper') * 4) + .inputs(metaitem('stickSteel')) .inputs(ore('plateSteel')) .fluidInputs(fluid('glass') * 576) .outputs(item('industrialrenewal:isolator_hv')) From 8d5b90ff10c2e004f354a9416f9fe3909a354bf5 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 22:14:47 +0700 Subject: [PATCH 3/6] Update GalvanizedSteel.groovy --- groovy/postInit/metallurgy/GalvanizedSteel.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/groovy/postInit/metallurgy/GalvanizedSteel.groovy b/groovy/postInit/metallurgy/GalvanizedSteel.groovy index 311aec12d..ff7ebd451 100644 --- a/groovy/postInit/metallurgy/GalvanizedSteel.groovy +++ b/groovy/postInit/metallurgy/GalvanizedSteel.groovy @@ -9,9 +9,9 @@ import static gregtech.api.unification.ore.OrePrefix.dye; FLUID_SOLIDIFIER = recipemap('fluid_solidifier') FLUID_SOLIDIFIER.recipeBuilder() - .inputs(ore('wireFineSteel') * 64) - .fluidInputs(fluid('zinc') * 144) - .outputs(metaitem('wireFineGalvanizedSteel') * 64) - .duration(800) + .inputs(ore('wireFineSteel') * 8) + .fluidInputs(fluid('zinc') * 18) + .outputs(metaitem('wireFineGalvanizedSteel') * 8) + .duration(100) .EUt(Globals.voltAmps[1]) .buildAndRegister() \ No newline at end of file From f10666fefd97505b6566e83a2c961abb87474b8b Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 22:24:51 +0700 Subject: [PATCH 4/6] Update GalvanizedSteel.groovy --- groovy/postInit/metallurgy/GalvanizedSteel.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/groovy/postInit/metallurgy/GalvanizedSteel.groovy b/groovy/postInit/metallurgy/GalvanizedSteel.groovy index ff7ebd451..be89ddf75 100644 --- a/groovy/postInit/metallurgy/GalvanizedSteel.groovy +++ b/groovy/postInit/metallurgy/GalvanizedSteel.groovy @@ -1,5 +1,4 @@ -import globals.Globals -import static globals.CarbonGlobals.* + import static gregtech.api.unification.material.Materials.*; import gregtech.api.unification.material.MarkerMaterials; From ab44b49eae03403f89a9eebe4854b44b255a1461 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 22:26:58 +0700 Subject: [PATCH 5/6] Update GalvanizedSteel.groovy --- groovy/postInit/metallurgy/GalvanizedSteel.groovy | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/groovy/postInit/metallurgy/GalvanizedSteel.groovy b/groovy/postInit/metallurgy/GalvanizedSteel.groovy index be89ddf75..cead3157e 100644 --- a/groovy/postInit/metallurgy/GalvanizedSteel.groovy +++ b/groovy/postInit/metallurgy/GalvanizedSteel.groovy @@ -1,9 +1,5 @@ - - -import static gregtech.api.unification.material.Materials.*; -import gregtech.api.unification.material.MarkerMaterials; -import static gregtech.api.unification.ore.OrePrefix.dye; - +import globals.Globals +import static globals.CarbonGlobals.* FLUID_SOLIDIFIER = recipemap('fluid_solidifier') From bd866edaa60ca783c40efb62c567f8f3c105983d Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 12 Sep 2024 22:27:10 +0700 Subject: [PATCH 6/6] Update GalvanizedSteel.groovy --- groovy/postInit/metallurgy/GalvanizedSteel.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/groovy/postInit/metallurgy/GalvanizedSteel.groovy b/groovy/postInit/metallurgy/GalvanizedSteel.groovy index cead3157e..72a18fd7f 100644 --- a/groovy/postInit/metallurgy/GalvanizedSteel.groovy +++ b/groovy/postInit/metallurgy/GalvanizedSteel.groovy @@ -1,5 +1,4 @@ import globals.Globals -import static globals.CarbonGlobals.* FLUID_SOLIDIFIER = recipemap('fluid_solidifier')