From 336b63bdef8b90e9b16ddf9f0e2af0c0c1b3e83b Mon Sep 17 00:00:00 2001 From: trainvoi Date: Tue, 3 Dec 2024 18:45:43 +0700 Subject: [PATCH 1/6] Update MachineRecipes.groovy --- groovy/postInit/mod/MachineRecipes.groovy | 50 +++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index fae36341d..7b5497c30 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -645,6 +645,56 @@ recipemap('assembler').recipeBuilder() .duration(200) .buildAndRegister() +//Extra Quadruple Hatches +def material = [null , "Bronze" , "Steel", + "StainlessSteel" , "Titanium" , "Tungstensteel", + "NiobiumTitanium" , null , null, + null , null , null, + null , null ]; + +for (i = 1; i <= 3; i++) { + + recipemap('assembler').recipeBuilder() + .inputs(metaitem('fluid_hatch.import.' + Globals.voltageTiers[i])) + .inputs(ore('pipeQuadrupleFluid' + material[i])) + .circuitMeta(4) + .fluidInputs(fluid('plastic') * 576) + .outputs(metaitem('fluid_hatch.import_4x.' + Globals.voltageTiers[i])) + .EUt(Globals.voltAmps[i]) + .duration(300) + .buildAndRegister() + + recipemap('assembler').recipeBuilder() + .inputs(metaitem('fluid_hatch.export.' + Globals.voltageTiers[i])) + .inputs(ore('pipeQuadrupleFluid' + material[i])) + .circuitMeta(4) + .fluidInputs(fluid('plastic') * 576) + .inputs(metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i])) + .EUt(Globals.voltAmps[i]) + .duration(300) + .buildAndRegister() + + recipemap('assembler').recipeBuilder() + .inputs(metaitem('fluid_hatch.import.' + Globals.voltageTiers[i])) + .inputs(ore('pipeNonupleFluid' + material[i])) + .circuitMeta(4) + .fluidInputs(fluid('plastic') * 1296) + .inputs(metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i])) + .EUt(Globals.voltAmps[i]) + .duration(600) + .buildAndRegister() + + recipemap('assembler').recipeBuilder() + .inputs(metaitem('fluid_hatch.export.' + Globals.voltageTiers[i])) + .inputs(ore('pipeNonupleFluid' + material[i])) + .circuitMeta(4) + .fluidInputs(fluid('plastic') * 1296) + .inputs(metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i])) + .EUt(Globals.voltAmps[i]) + .duration(600) + .buildAndRegister() +} + RecyclingHelper.addShaped("gregtech:ore_sorter", metaitem('ore_sorter'), [ [robotArms[1], circuits[2], robotArms[1]], [pumps[1], hulls[1], pumps[1]], From a053ce16514a527043974b5997f7c83d635ac37d Mon Sep 17 00:00:00 2001 From: trainvoi Date: Tue, 3 Dec 2024 18:46:38 +0700 Subject: [PATCH 2/6] Update MachineRecipes.groovy --- groovy/postInit/mod/MachineRecipes.groovy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index 7b5497c30..fddf3b211 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -646,17 +646,17 @@ recipemap('assembler').recipeBuilder() .buildAndRegister() //Extra Quadruple Hatches -def material = [null , "Bronze" , "Steel", - "StainlessSteel" , "Titanium" , "Tungstensteel", - "NiobiumTitanium" , null , null, - null , null , null, - null , null ]; +def materialPipe = [null , "Bronze" , "Steel", + "StainlessSteel" , "Titanium" , "Tungstensteel", + "NiobiumTitanium" , null , null, + null , null , null, + null , null ]; for (i = 1; i <= 3; i++) { recipemap('assembler').recipeBuilder() .inputs(metaitem('fluid_hatch.import.' + Globals.voltageTiers[i])) - .inputs(ore('pipeQuadrupleFluid' + material[i])) + .inputs(ore('pipeQuadrupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 576) .outputs(metaitem('fluid_hatch.import_4x.' + Globals.voltageTiers[i])) @@ -666,7 +666,7 @@ for (i = 1; i <= 3; i++) { recipemap('assembler').recipeBuilder() .inputs(metaitem('fluid_hatch.export.' + Globals.voltageTiers[i])) - .inputs(ore('pipeQuadrupleFluid' + material[i])) + .inputs(ore('pipeQuadrupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 576) .inputs(metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i])) @@ -676,7 +676,7 @@ for (i = 1; i <= 3; i++) { recipemap('assembler').recipeBuilder() .inputs(metaitem('fluid_hatch.import.' + Globals.voltageTiers[i])) - .inputs(ore('pipeNonupleFluid' + material[i])) + .inputs(ore('pipeNonupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 1296) .inputs(metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i])) @@ -686,7 +686,7 @@ for (i = 1; i <= 3; i++) { recipemap('assembler').recipeBuilder() .inputs(metaitem('fluid_hatch.export.' + Globals.voltageTiers[i])) - .inputs(ore('pipeNonupleFluid' + material[i])) + .inputs(ore('pipeNonupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 1296) .inputs(metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i])) From aed74bd594e3fa60da5e346b10583da7bc3f971f Mon Sep 17 00:00:00 2001 From: trainvoi Date: Wed, 4 Dec 2024 11:09:54 +0700 Subject: [PATCH 3/6] Update MachineRecipes.groovy --- groovy/postInit/mod/MachineRecipes.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index fddf3b211..f1a839ac6 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -114,7 +114,7 @@ def tieredSprings = [metaitem('springIron'), metaitem('springCopper'), metaitem( metaitem('springNaquadah'), metaitem('springNaquadahAlloy')] def rotors = [ - ore('rotorBronze'), + ore('rotorLead'), ore('rotorTin'), ore('rotorBronze'), ore('rotorSteel'), @@ -648,8 +648,8 @@ recipemap('assembler').recipeBuilder() //Extra Quadruple Hatches def materialPipe = [null , "Bronze" , "Steel", "StainlessSteel" , "Titanium" , "Tungstensteel", - "NiobiumTitanium" , null , null, - null , null , null, + "NiobiumTitanium" , "Iridium" , "Naquadah", + "Neutronium" , null , null, null , null ]; for (i = 1; i <= 3; i++) { From 092d594ca7c33f3d54aa29eb3012aac9b87570d0 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 5 Dec 2024 00:38:31 +0700 Subject: [PATCH 4/6] formatting --- groovy/postInit/mod/MachineRecipes.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index f1a839ac6..5ce960639 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -646,11 +646,11 @@ recipemap('assembler').recipeBuilder() .buildAndRegister() //Extra Quadruple Hatches -def materialPipe = [null , "Bronze" , "Steel", - "StainlessSteel" , "Titanium" , "Tungstensteel", - "NiobiumTitanium" , "Iridium" , "Naquadah", - "Neutronium" , null , null, - null , null ]; +def materialPipe = [null , "Bronze" , "Steel", + "StainlessSteel" , "Titanium", "Tungstensteel", + "NiobiumTitanium", "Iridium" , "Naquadah", + "Neutronium" , null , null, + null , null]; for (i = 1; i <= 3; i++) { From be7a400ec476be5089cf0aa2f19283b8f9412b58 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Mon, 9 Dec 2024 20:38:04 +0700 Subject: [PATCH 5/6] fix indenting --- groovy/postInit/mod/MachineRecipes.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index 5ce960639..8bec55f39 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -646,11 +646,7 @@ recipemap('assembler').recipeBuilder() .buildAndRegister() //Extra Quadruple Hatches -def materialPipe = [null , "Bronze" , "Steel", - "StainlessSteel" , "Titanium", "Tungstensteel", - "NiobiumTitanium", "Iridium" , "Naquadah", - "Neutronium" , null , null, - null , null]; +def materialPipe = [null,"Bronze","Steel","StainlessSteel","Titanium","Tungstensteel","NiobiumTitanium","Iridium","Naquadah","Neutronium",null,null,null,null]; for (i = 1; i <= 3; i++) { From d735d0a0d74680ddd12819be39140ba36d54569c Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:36:22 -0600 Subject: [PATCH 6/6] fix: in/out + interconversion --- groovy/postInit/mod/MachineRecipes.groovy | 32 ++++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/groovy/postInit/mod/MachineRecipes.groovy b/groovy/postInit/mod/MachineRecipes.groovy index 8bec55f39..7bb36a56f 100755 --- a/groovy/postInit/mod/MachineRecipes.groovy +++ b/groovy/postInit/mod/MachineRecipes.groovy @@ -646,7 +646,7 @@ recipemap('assembler').recipeBuilder() .buildAndRegister() //Extra Quadruple Hatches -def materialPipe = [null,"Bronze","Steel","StainlessSteel","Titanium","Tungstensteel","NiobiumTitanium","Iridium","Naquadah","Neutronium",null,null,null,null]; +def materialPipe = [null, "Bronze", "Steel", "StainlessSteel", "Titanium", "Tungstensteel", "NiobiumTitanium", "Iridium", "Naquadah", "Neutronium", null, null, null, null]; for (i = 1; i <= 3; i++) { @@ -665,7 +665,7 @@ for (i = 1; i <= 3; i++) { .inputs(ore('pipeQuadrupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 576) - .inputs(metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i])) + .outputs(metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i])) .EUt(Globals.voltAmps[i]) .duration(300) .buildAndRegister() @@ -675,7 +675,7 @@ for (i = 1; i <= 3; i++) { .inputs(ore('pipeNonupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 1296) - .inputs(metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i])) + .outputs(metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i])) .EUt(Globals.voltAmps[i]) .duration(600) .buildAndRegister() @@ -685,10 +685,34 @@ for (i = 1; i <= 3; i++) { .inputs(ore('pipeNonupleFluid' + materialPipe[i])) .circuitMeta(4) .fluidInputs(fluid('plastic') * 1296) - .inputs(metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i])) + .outputs(metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i])) .EUt(Globals.voltAmps[i]) .duration(600) .buildAndRegister() + + // Interconversion + crafting.addShaped("susy:fluid_hatch.import_to_export.4x." + Globals.voltageTiers[i], + metaitem('fluid_hatch.import_4x.' + Globals.voltageTiers[i]), [ + [ore('craftingToolScrewdriver')], + [metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i])] + ]) + crafting.addShaped("susy:fluid_hatch.export_to_import.4x." + Globals.voltageTiers[i], + metaitem('fluid_hatch.export_4x.' + Globals.voltageTiers[i]), [ + [ore('craftingToolScrewdriver')], + [metaitem('fluid_hatch.import_4x.' + Globals.voltageTiers[i])] + ]) + + crafting.addShaped("susy:fluid_hatch.import_to_export.9x." + Globals.voltageTiers[i], + metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i]), [ + [ore('craftingToolScrewdriver')], + [metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i])] + ]) + crafting.addShaped("susy:fluid_hatch.export_to_import.9x." + Globals.voltageTiers[i], + metaitem('fluid_hatch.export_9x.' + Globals.voltageTiers[i]), [ + [ore('craftingToolScrewdriver')], + [metaitem('fluid_hatch.import_9x.' + Globals.voltageTiers[i])] + ]) + } RecyclingHelper.addShaped("gregtech:ore_sorter", metaitem('ore_sorter'), [