diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 0e918dcd2..151c237b3 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -1263,25 +1263,227 @@ const registerAE2Recipes = (event) => { .EUt(122880) .cleanroom(CleanroomType.CLEANROOM) + + //circuit_assembler + //logic_processor + event.recipes.gtceu.circuit_assembler('ae2:logic_processor') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_logic_processor', + '#forge:circuits/lv', + '2x #gtceu:resistors', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:logic_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.circuit_assembler('ae2:logic_processor_adv') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_logic_processor', + '#forge:circuits/lv', + 'gtceu:advanced_smd_resistor', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:logic_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + + //calculation_processor + event.recipes.gtceu.circuit_assembler('ae2:calculation_processor') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_calculation_processor', + '#forge:circuits/lv', + '2x #gtceu:resistors', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:calculation_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.circuit_assembler('ae2:calculation_processor_adv') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_calculation_processor', + '#forge:circuits/lv', + 'gtceu:advanced_smd_resistor', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:calculation_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + + //engineering_processor + event.recipes.gtceu.circuit_assembler('ae2:engineering_processor') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_engineering_processor', + '#forge:circuits/lv', + '2x #gtceu:resistors', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:engineering_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.circuit_assembler('ae2:engineering_processor_adv') + .itemInputs( + 'ae2:printed_silicon', + 'ae2:printed_engineering_processor', + '#forge:circuits/lv', + 'gtceu:advanced_smd_resistor', + '2x #forge:wires/fine/tin',) + .inputFluids(Fluid.of('gtceu:redstone', 144)) + .itemOutputs('2x ae2:engineering_processor') + .duration(20) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + + //chemical_bath - //cable + //glass cable event.recipes.gtceu.chemical_bath('ae2:fluix_glass_cable') .itemInputs( '#ae2:glass_cable') - .inputFluids(Fluid.of('gtceu:chlorine', 144)) + .inputFluids(Fluid.of('gtceu:chlorine', 100)) .itemOutputs( 'ae2:fluix_glass_cable') .duration(8) .EUt(480) + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLE[i]+'gtceudye') + .itemInputs('ae2:fluix_glass_cable') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .itemOutputs(global.AE2_GLASS_CABLE[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLE[i]+'tfcdye') + .itemInputs('ae2:fluix_glass_cable') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 250)) + .itemOutputs(global.AE2_GLASS_CABLE[i]) + .duration(20) + .EUt(7) + }; - for(i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(rrayAE2.glassCables[i]) - .itemInputs(ore('ae2.cable.glass')) - .inputFluids(arrayVanila.colorLiquid[i] * 18) - .itemOutputs(arrayAE2.glassCables[i]) - .duration(20) - .EUt(7) - } + //covered cable + event.recipes.gtceu.chemical_bath('ae2:fluix_covered_cable') + .itemInputs( + '#ae2:covered_cable') + .inputFluids(Fluid.of('gtceu:chlorine', 100)) + .itemOutputs( + 'ae2:fluix_covered_cable') + .duration(8) + .EUt(480) + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLE[i]+'gtceudye') + .itemInputs('ae2:fluix_covered_cable') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .itemOutputs(global.AE2_COVERED_CABLE[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLE[i]+'tfcdye') + .itemInputs('ae2:fluix_covered_cable') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 250)) + .itemOutputs(global.AE2_COVERED_CABLE[i]) + .duration(20) + .EUt(7) + }; + + // Dense Covered Cable + event.recipes.gtceu.chemical_bath('ae2:fluix_covered_dense_cable') + .itemInputs( + '#ae2:covered_dense_cable') + .inputFluids(Fluid.of('gtceu:chlorine', 100)) + .itemOutputs( + 'ae2:fluix_covered_dense_cable') + .duration(8) + .EUt(480) + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLE[i]+'gtceudye') + .itemInputs('ae2:fluix_covered_dense_cable') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .itemOutputs(global.AE2_COVERED_DENSE_CABLE[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLE[i]+'tfcdye') + .itemInputs('ae2:fluix_covered_dense_cable') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 250)) + .itemOutputs(global.AE2_COVERED_DENSE_CABLE[i]) + .duration(20) + .EUt(7) + }; + + // Smart Cable + event.recipes.gtceu.chemical_bath('ae2:fluix_smart_cable') + .itemInputs( + '#ae2:smart_cable') + .inputFluids(Fluid.of('gtceu:chlorine', 100)) + .itemOutputs( + 'ae2:fluix_smart_cable') + .duration(8) + .EUt(480) + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLE[i]+'gtceudye') + .itemInputs('ae2:fluix_smart_cable') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .itemOutputs(global.AE2_SMART_CABLE[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLE[i]+'tfcdye') + .itemInputs('ae2:fluix_smart_cable') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 250)) + .itemOutputs(global.AE2_SMART_CABLE[i]) + .duration(20) + .EUt(7) + }; + + // Dense Smart Cable + event.recipes.gtceu.chemical_bath('ae2:fluix_smart_dense_cable') + .itemInputs( + '#ae2:smart_dense_cable') + .inputFluids(Fluid.of('gtceu:chlorine', 100)) + .itemOutputs( + 'ae2:fluix_smart_dense_cable') + .duration(8) + .EUt(480) + //greg dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLE[i]+'gtceudye') + .itemInputs('ae2:fluix_smart_dense_cable') + .inputFluids(Fluid.of(global.GTCEU_LIQUID_DYE[i], 72)) + .itemOutputs(global.AE2_SMART_DENSE_CABLE[i]) + .duration(20) + .EUt(7) + }; + //tfc dye + for (var i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLE[i]+'tfcdye') + .itemInputs('ae2:fluix_smart_dense_cable') + .inputFluids(Fluid.of(global.TFC_LIQUID_DYE[i], 250)) + .itemOutputs(global.AE2_SMART_DENSE_CABLE[i]) + .duration(20) + .EUt(7) + }; } diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 323daaf7f..f0d25dc30 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -20,112 +20,108 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:nether_quartz_pickaxe', 'ae2:fluix_pickaxe', ]; -/* + // Glass Cable -global.AE2_glassCables = [ - item('appliedenergistics2:part'), - item('appliedenergistics2:part', 1), - item('appliedenergistics2:part', 2), - item('appliedenergistics2:part', 3), - item('appliedenergistics2:part', 4), - item('appliedenergistics2:part', 5), - item('appliedenergistics2:part', 6), - item('appliedenergistics2:part', 7), - item('appliedenergistics2:part', 8), - item('appliedenergistics2:part', 9), - item('appliedenergistics2:part', 10), - item('appliedenergistics2:part', 11), - item('appliedenergistics2:part', 12), - item('appliedenergistics2:part', 13), - item('appliedenergistics2:part', 14), - item('appliedenergistics2:part', 15), - item('appliedenergistics2:part', 16) +global.AE2_GLASS_CABLE = [ + 'ae2:white_glass_cable', + 'ae2:orange_glass_cable', + 'ae2:magenta_glass_cable', + 'ae2:light_blue_glass_cable', + 'ae2:yellow_glass_cable', + 'ae2:lime_glass_cable', + 'ae2:pink_glass_cable', + 'ae2:gray_glass_cable', + 'ae2:light_gray_glass_cable', + 'ae2:cyan_glass_cable', + 'ae2:purple_glass_cable', + 'ae2:blue_glass_cable', + 'ae2:brown_glass_cable', + 'ae2:green_glass_cable', + 'ae2:red_glass_cable', + 'ae2:black_glass_cable', ] // Covered Cable -global.AE2_coveredCables = [ - item('appliedenergistics2:part', 20), - item('appliedenergistics2:part', 21), - item('appliedenergistics2:part', 22), - item('appliedenergistics2:part', 23), - item('appliedenergistics2:part', 24), - item('appliedenergistics2:part', 25), - item('appliedenergistics2:part', 26), - item('appliedenergistics2:part', 27), - item('appliedenergistics2:part', 28), - item('appliedenergistics2:part', 29), - item('appliedenergistics2:part', 30), - item('appliedenergistics2:part', 31), - item('appliedenergistics2:part', 32), - item('appliedenergistics2:part', 33), - item('appliedenergistics2:part', 34), - item('appliedenergistics2:part', 35), - item('appliedenergistics2:part', 36) -] - -// Smart Cable -global.AE2_smartCables = [ - item('appliedenergistics2:part', 40), - item('appliedenergistics2:part', 41), - item('appliedenergistics2:part', 42), - item('appliedenergistics2:part', 43), - item('appliedenergistics2:part', 44), - item('appliedenergistics2:part', 45), - item('appliedenergistics2:part', 46), - item('appliedenergistics2:part', 47), - item('appliedenergistics2:part', 48), - item('appliedenergistics2:part', 49), - item('appliedenergistics2:part', 50), - item('appliedenergistics2:part', 51), - item('appliedenergistics2:part', 52), - item('appliedenergistics2:part', 53), - item('appliedenergistics2:part', 54), - item('appliedenergistics2:part', 55), - item('appliedenergistics2:part', 56) -] - -// Dense Smart Cable -global.AE2_denseSmartCables = [ - item('appliedenergistics2:part', 60), - item('appliedenergistics2:part', 61), - item('appliedenergistics2:part', 62), - item('appliedenergistics2:part', 63), - item('appliedenergistics2:part', 64), - item('appliedenergistics2:part', 65), - item('appliedenergistics2:part', 66), - item('appliedenergistics2:part', 67), - item('appliedenergistics2:part', 68), - item('appliedenergistics2:part', 69), - item('appliedenergistics2:part', 70), - item('appliedenergistics2:part', 71), - item('appliedenergistics2:part', 72), - item('appliedenergistics2:part', 73), - item('appliedenergistics2:part', 74), - item('appliedenergistics2:part', 75), - item('appliedenergistics2:part', 76) +global.AE2_COVERED_CABLE = [ + 'ae2:white_covered_cable', + 'ae2:orange_covered_cable', + 'ae2:magenta_covered_cable', + 'ae2:light_blue_covered_cable', + 'ae2:yellow_covered_cable', + 'ae2:lime_covered_cable', + 'ae2:pink_covered_cable', + 'ae2:gray_covered_cable', + 'ae2:light_gray_covered_cable', + 'ae2:cyan_covered_cable', + 'ae2:purple_covered_cable', + 'ae2:blue_covered_cable', + 'ae2:brown_covered_cable', + 'ae2:green_covered_cable', + 'ae2:red_covered_cable', + 'ae2:black_covered_cable', ] // Dense Covered Cable -global.AE2_denseCoveredCables = [ - item('appliedenergistics2:part', 500), - item('appliedenergistics2:part', 501), - item('appliedenergistics2:part', 502), - item('appliedenergistics2:part', 503), - item('appliedenergistics2:part', 504), - item('appliedenergistics2:part', 505), - item('appliedenergistics2:part', 506), - item('appliedenergistics2:part', 507), - item('appliedenergistics2:part', 508), - item('appliedenergistics2:part', 509), - item('appliedenergistics2:part', 510), - item('appliedenergistics2:part', 511), - item('appliedenergistics2:part', 512), - item('appliedenergistics2:part', 513), - item('appliedenergistics2:part', 514), - item('appliedenergistics2:part', 515), - item('appliedenergistics2:part', 516) +global.AE2_COVERED_DENSE_CABLE = [ + 'ae2:white_covered_dense_cable', + 'ae2:orange_covered_dense_cable', + 'ae2:magenta_covered_dense_cable', + 'ae2:light_blue_covered_dense_cable', + 'ae2:yellow_covered_dense_cable', + 'ae2:lime_covered_dense_cable', + 'ae2:pink_covered_dense_cable', + 'ae2:gray_covered_dense_cable', + 'ae2:light_gray_covered_dense_cable', + 'ae2:cyan_covered_dense_cable', + 'ae2:purple_covered_dense_cable', + 'ae2:blue_covered_dense_cable', + 'ae2:brown_covered_dense_cable', + 'ae2:green_covered_dense_cable', + 'ae2:red_covered_dense_cable', + 'ae2:black_covered_dense_cable', ] +// Smart Cable +global.AE2_SMART_CABLE = [ + 'ae2:white_smart_cable', + 'ae2:orange_smart_cable', + 'ae2:magenta_smart_cable', + 'ae2:light_blue_smart_cable', + 'ae2:yellow_smart_cable', + 'ae2:lime_smart_cable', + 'ae2:pink_smart_cable', + 'ae2:gray_smart_cable', + 'ae2:light_gray_smart_cable', + 'ae2:cyan_smart_cable', + 'ae2:purple_smart_cable', + 'ae2:blue_smart_cable', + 'ae2:brown_smart_cable', + 'ae2:green_smart_cable', + 'ae2:red_smart_cable', + 'ae2:black_smart_cable', +] + +// Dense Smart Cable +global.AE2_SMART_DENSE_CABLE = [ + 'ae2:white_smart_dense_cable', + 'ae2:orange_smart_dense_cable', + 'ae2:magenta_smart_dense_cable', + 'ae2:light_blue_smart_dense_cable', + 'ae2:yellow_smart_dense_cable', + 'ae2:lime_smart_dense_cable', + 'ae2:pink_smart_dense_cable', + 'ae2:gray_smart_dense_cable', + 'ae2:light_gray_smart_dense_cable', + 'ae2:cyan_smart_dense_cable', + 'ae2:purple_smart_dense_cable', + 'ae2:blue_smart_dense_cable', + 'ae2:brown_smart_dense_cable', + 'ae2:green_smart_dense_cable', + 'ae2:red_smart_dense_cable', + 'ae2:black_smart_dense_cable', +] + +/* // Paint ball global.AE2_paintBalls = [ item('appliedenergistics2:paint_ball'), diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index cd09d4ad7..f51823ac9 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -31,5 +31,4 @@ global.GTCEU_LIQUID_DYE = [ 'gtceu:green_dye', 'gtceu:red_dye', 'gtceu:black_dye', - 'gtceu:white_dye' -] \ No newline at end of file +]; \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 9f506bd42..02f017384 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -2100,7 +2100,7 @@ global.TFC_ORE_MATERIALS = [ "tetrahedrite" ]; -global.AE2_LIQUID_DYE = [ +global.TFC_LIQUID_DYE = [ 'tfc:white_dye', 'tfc:orange_dye', 'tfc:magenta_dye', @@ -2117,5 +2117,4 @@ global.AE2_LIQUID_DYE = [ 'tfc:green_dye', 'tfc:red_dye', 'tfc:black_dye', - 'tfc:white_dye' ]; \ No newline at end of file