diff --git a/groovy/postInit/components/IntegratedCircuits.groovy b/groovy/postInit/components/IntegratedCircuits.groovy index a48cfd25e..51cf9cc37 100644 --- a/groovy/postInit/components/IntegratedCircuits.groovy +++ b/groovy/postInit/components/IntegratedCircuits.groovy @@ -8,11 +8,24 @@ def CIRCUIT_ASSEMBLER = recipemap('circuit_assembler') mods.gregtech.circuit_assembler.removeByInput(16, [metaitem('circuit_board.basic'), metaitem('plate.integrated_logic_circuit'), metaitem('component.resistor') * 2, metaitem('component.diode') * 2, metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('soldering_alloy') * 72]) + +// NAND Chip * 8 +mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.good'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('soldering_alloy') * 72]) +// NAND Chip * 8 +mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.good'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('tin') * 144]) +// NAND Chip * 12 +mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('soldering_alloy') * 72]) +// NAND Chip * 12 +mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('tin') * 144]) +// Microprocessor * 6 +mods.gregtech.circuit_assembler.removeByInput(600, [metaitem('circuit_board.plastic'), metaitem('plate.system_on_chip'), metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('soldering_alloy') * 72]) +// Microprocessor * 6 +mods.gregtech.circuit_assembler.removeByInput(600, [metaitem('circuit_board.plastic'), metaitem('plate.system_on_chip'), metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('tin') * 144]) + // Microprocessor * 5 mods.gregtech.circuit_assembler.removeByInput(60, [metaitem('circuit_board.plastic'), metaitem('plate.central_processing_unit'), metaitem('component.resistor') * 2, metaitem('component.capacitor') * 2, metaitem('component.transistor') * 2, metaitem('wireFineCopper') * 2], [fluid('tin') * 144 * 144]) mods.gregtech.circuit_assembler.removeByInput(60, [metaitem('circuit_board.plastic'), metaitem('plate.central_processing_unit'), metaitem('component.resistor') * 2, metaitem('component.capacitor') * 2, metaitem('component.transistor') * 2, metaitem('wireFineCopper') * 2], [fluid('soldering_alloy') * 72 * 72]) - // Integrated Processor * 2 mods.gregtech.circuit_assembler.removeByInput(60, [metaitem('circuit_board.plastic'), metaitem('plate.central_processing_unit'), metaitem('component.resistor') * 4, metaitem('component.capacitor') * 4, metaitem('component.transistor') * 4, metaitem('wireFineRedAlloy') * 4], [fluid('tin') * 144 * 144]) mods.gregtech.circuit_assembler.removeByInput(60, [metaitem('circuit_board.plastic'), metaitem('plate.central_processing_unit'), metaitem('component.resistor') * 4, metaitem('component.capacitor') * 4, metaitem('component.transistor') * 4, metaitem('wireFineRedAlloy') * 4], [fluid('soldering_alloy') * 72 * 72]) @@ -31,8 +44,29 @@ mods.gregtech.circuit_assembler.removeByInput(480, [metaitem('frameAluminium') * mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('circuit.assembly') * 2, metaitem('component.diode') * 4, metaitem('plate.random_access_memory') * 4, metaitem('wireFineElectrum') * 16, metaitem('boltBlueAlloy') * 16], [fluid('soldering_alloy') * 144]) mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('circuit.assembly') * 2, metaitem('component.diode') * 4, metaitem('plate.random_access_memory') * 4, metaitem('wireFineElectrum') * 16, metaitem('boltBlueAlloy') * 16], [fluid('tin') * 288]) - Globals.solders.each { key, val -> + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('circuit_board.good')) + .inputs(metaitem('plate.integrated_logic_circuit')) + .inputs(ore('boltRedAlloy') * 2) + .inputs(ore('wireFineTin') * 2) + .fluidInputs(fluid(key) * val) + .outputs(metaitem('circuit.nand_chip') * 16) + .duration(10) + .EUt(16) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('circuit_board.plastic')) + .inputs(metaitem('plate.integrated_logic_circuit')) + .inputs(ore('boltRedAlloy') * 2) + .inputs(ore('wireFineTin') * 2) + .fluidInputs(fluid(key) * val) + .outputs(metaitem('circuit.nand_chip') * 24) + .duration(10) + .EUt(16) + .buildAndRegister(); + CIRCUIT_ASSEMBLER.recipeBuilder() .inputs(metaitem('circuit_board.plastic')) .inputs(metaitem('plate.integrated_logic_circuit')) @@ -41,11 +75,35 @@ Globals.solders.each { key, val -> .inputs(metaitem('wireFineCopper') * 2) .inputs(metaitem('boltTin') * 2) .fluidInputs(fluid(key) * val) - .outputs(metaitem('circuit.microprocessor') * 5) + .outputs(metaitem('circuit.microprocessor') * 6) .duration(200) .EUt(120) .buildAndRegister() + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('circuit_board.plastic')) + .inputs(metaitem('plate.central_processing_unit')) + .inputs(metaitem('component.smd.resistor') * 2) + .inputs(metaitem('component.smd.capacitor') * 2) + .inputs(metaitem('component.smd.transistor') * 2) + .inputs(ore('wireFineCopper') * 2) + .fluidInputs(fluid(key) * val) + .outputs(metaitem('circuit.microprocessor') * 12) + .duration(200) + .EUt(60) + .buildAndRegister(); + + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('circuit_board.plastic')) + .inputs(metaitem('plate.system_on_chip')) + .inputs(ore('wireFineCopper') * 2) + .inputs(ore('boltTin') * 2) + .fluidInputs(fluid(key) * val) + .outputs(metaitem('circuit.microprocessor') * 18) + .duration(50) + .EUt(600) + .buildAndRegister(); + CIRCUIT_ASSEMBLER.recipeBuilder() .inputs(metaitem('circuit_board.plastic')) .inputs(metaitem('plate.integrated_logic_circuit')) @@ -95,8 +153,9 @@ Globals.solders.each { key, val -> .inputs(metaitem('wireGtSingleAnnealedCopper') * 16) .fluidInputs(fluid(key) * (val * 4)) .outputs(metaitem('circuit.mainframe')) + .cleanroom(CleanroomType.CLEANROOM) .duration(500) - .EUt(480) + .EUt(120) .buildAndRegister(); } diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index c722afcd0..b4062e088 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -1308,74 +1308,6 @@ mods.gregtech.alloy_blast_smelter.removeByInput(1920, [metaitem('dustSamarium'), // Molten Samarium Iron Arsenic Oxide * 576 mods.gregtech.alloy_blast_smelter.removeByInput(1920, [metaitem('dustSamarium'), metaitem('dustIron'), metaitem('dustArsenic'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('oxygen') * 1000]) -// NAND Chip * 8 -mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.good'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('soldering_alloy') * 72]) -// NAND Chip * 8 -mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.good'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('tin') * 144]) -// NAND Chip * 12 -mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('soldering_alloy') * 72]) -// NAND Chip * 12 -mods.gregtech.circuit_assembler.removeByInput(120, [metaitem('circuit_board.plastic'), metaitem('plate.simple_system_on_chip'), metaitem('boltRedAlloy') * 2, metaitem('wireFineTin') * 2], [fluid('tin') * 144]) -// Microprocessor * 6 -mods.gregtech.circuit_assembler.removeByInput(600, [metaitem('circuit_board.plastic'), metaitem('plate.system_on_chip'), metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('soldering_alloy') * 72]) -// Microprocessor * 6 -mods.gregtech.circuit_assembler.removeByInput(600, [metaitem('circuit_board.plastic'), metaitem('plate.system_on_chip'), metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('tin') * 144]) - -Globals.solders.each { key, val -> - mods.gregtech.circuit_assembler.recipeBuilder() - .inputs(metaitem('circuit_board.good')) - .inputs(metaitem('plate.integrated_logic_circuit')) - .inputs(ore('boltRedAlloy') * 2) - .inputs(ore('wireFineTin') * 2) - .fluidInputs(fluid(key) * val) - .outputs(metaitem('circuit.nand_chip') * 16) - .duration(10) - .EUt(16) - .buildAndRegister(); -} - -Globals.solders.each { key, val -> - mods.gregtech.circuit_assembler.recipeBuilder() - .inputs(metaitem('circuit_board.plastic')) - .inputs(metaitem('plate.integrated_logic_circuit')) - .inputs(ore('boltRedAlloy') * 2) - .inputs(ore('wireFineTin') * 2) - .fluidInputs(fluid(key) * val) - .outputs(metaitem('circuit.nand_chip') * 24) - .duration(10) - .EUt(16) - .buildAndRegister(); -} - -Globals.solders.each { key, val -> - mods.gregtech.circuit_assembler.recipeBuilder() - .inputs(metaitem('circuit_board.plastic')) - .inputs(metaitem('plate.central_processing_unit')) - .inputs(ore('componentResistor') * 2) - .inputs(ore('componentCapacitor') * 2) - .inputs(ore('componentTransistor') * 2) - .inputs(ore('wireFineCopper') * 2) - .fluidInputs(fluid(key) * val) - .outputs(metaitem('circuit.microprocessor') * 8) - .duration(200) - .EUt(60) - .buildAndRegister(); -} - -Globals.solders.each { key, val -> - mods.gregtech.circuit_assembler.recipeBuilder() - .inputs(metaitem('circuit_board.plastic')) - .inputs(metaitem('plate.system_on_chip')) - .inputs(ore('wireFineCopper') * 2) - .inputs(ore('boltTin') * 2) - .fluidInputs(fluid(key) * val) - .outputs(metaitem('circuit.microprocessor') * 12) - .duration(50) - .EUt(600) - .buildAndRegister(); -} - - mods.gregtech.centrifuge.recipeBuilder() .fluidInputs(fluid('gtfo_soybean_oil') * 1000) .fluidOutputs(fluid('seed_oil') * 1000)