diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b34c4cd..698e6a614 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Added the ability for foods to affect the player's temperature @BlueBoat29 - EMI Batched rendering has been disabled by default. @TomPlop - Automatic backups now happen hourly instead of daily (#1705) @Pyritie @Xikaro +- Advanced Peripherals' Redstone Integrator has been deprecated in favour of ComputerCraft's Redstone Relay (#1737) @Pyritie ### Bug fixes - Fixed tongs getting stuck in ovens, and now you can use them the same way you'd previously use a Peel @Pyritie - Allowed powders, gears, plates, double plates, springs, and small springs to be heated (#1727) @Redeix diff --git a/kubejs/server_scripts/advancedperipherals/recipes.js b/kubejs/server_scripts/advancedperipherals/recipes.js index 52d6f9412..543e4f6be 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.js @@ -48,14 +48,6 @@ const registerAdvancedPeripheralsRecipes = (event) => { .duration(1200) .EUt(GTValues.VA[GTValues.HV]) - //Redstone Integrator - event.recipes.gtceu.assembler('advancedperipherals:assembler/redstone_integrator') - .itemInputs('1x computercraft:wired_modem', '1x gtceu:mv_machine_casing', '10x vintageimprovements:redstone_module', '1x ae2:redstone_card', '2x gtceu:transistor', '1x gtceu:mv_emitter') - .circuit(4) - .itemOutputs('advancedperipherals:redstone_integrator') - .duration(1200) - .EUt(GTValues.VA[GTValues.MV]) - //Block Reader event.recipes.gtceu.assembler('advancedperipherals:assembler/block_reader') .itemInputs('1x computercraft:wired_modem', '1x gtceu:mv_machine_casing', '1x gtceu:lv_scanner', '1x gtceu:mv_sensor', '1x gtceu:mv_emitter', '1x #forge:lenses/amethyst') diff --git a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js index f89581acd..2950f4d3a 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js @@ -120,29 +120,6 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) - // Redstone Integrator - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/redstone_integrator') - .itemInputs('advancedperipherals:redstone_integrator') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedAlloy, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Brass, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4) - ) - .duration(GTMaterials.RedAlloy.getMass() * 6) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/redstone_integrator') - .itemInputs('advancedperipherals:redstone_integrator') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedAlloy, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Brass, 5), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4) - ) - .duration(GTMaterials.RedAlloy.getMass() * 6) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - // Block Reader event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/block_reader') .itemInputs('advancedperipherals:block_reader') diff --git a/kubejs/server_scripts/computer_craft/recipes.js b/kubejs/server_scripts/computer_craft/recipes.js index 821523833..cd986465c 100644 --- a/kubejs/server_scripts/computer_craft/recipes.js +++ b/kubejs/server_scripts/computer_craft/recipes.js @@ -2,242 +2,250 @@ "use strict"; const registerComputerCraftRecipes = (event) => { - - registerComputerCraftRecyclingRecipes(event); - // Удаление рецептов мода - event.remove({ not: [ - { id: 'computercraft:printed_pages' }, - { id: 'computercraft:printed_book' }, - ], mod: 'computercraft' }); + registerComputerCraftRecyclingRecipes(event); - // Networking Cable - event.recipes.gtceu.assembler('computercraft:cable') - .itemInputs('ae2:fluix_glass_cable') - .inputFluids(Fluid.of('gtceu:redstone', 288)) - .itemOutputs('computercraft:cable') - .duration(80) - .EUt(120) - - // Wireless Modem Normal - event.shaped('computercraft:wireless_modem_normal', [ - ' A ', - 'BCB', - ' D ' - ], { - A: 'gtceu:hv_sensor', - B: 'ae2:calculation_processor', - C: '#gtceu:circuits/hv', - D: 'computercraft:cable', - }).id('tfg:crafting/wireless_modem_normal') + // Удаление рецептов мода + event.remove({ + not: [ + { id: 'computercraft:printed_pages' }, + { id: 'computercraft:printed_book' }, + ], mod: 'computercraft' + }); - // Wireless Modem Advanced - event.shaped('computercraft:wireless_modem_advanced', [ - ' A ', - 'BCB', - ' D ' - ], { - A: 'ae2:wireless_receiver', - B: 'ae2:calculation_processor', - C: '#gtceu:circuits/hv', - D: 'computercraft:cable', - }).id('tfg:crafting/wireless_modem_advanced') + // Networking Cable + event.recipes.gtceu.assembler('computercraft:cable') + .itemInputs('ae2:fluix_glass_cable') + .inputFluids(Fluid.of('gtceu:redstone', 288)) + .itemOutputs('computercraft:cable') + .duration(80) + .EUt(120) - // Monitor Normal - event.shaped('computercraft:monitor_normal', [ - 'ABA', - 'CDC', - 'EFE' - ], { - A: 'gtceu:magnesium_diboride_single_wire', - B: 'gtceu:computer_monitor_cover', - C: 'ae2:calculation_processor', - D: 'gtceu:mv_machine_casing', - E: 'computercraft:cable', - F: '#gtceu:circuits/mv', - }).id('tfg:crafting/monitor_normal') + // Wireless Modem Normal + event.shaped('computercraft:wireless_modem_normal', [ + ' A ', + 'BCB', + ' D ' + ], { + A: 'gtceu:hv_sensor', + B: 'ae2:calculation_processor', + C: '#gtceu:circuits/hv', + D: 'computercraft:cable', + }).id('tfg:crafting/wireless_modem_normal') - // Monitor Advanced - event.shaped('computercraft:monitor_advanced', [ - 'ABA', - 'CDC', - 'EFE' - ], { - A: 'gtceu:mercury_barium_calcium_cuprate_single_wire', - B: 'gtceu:computer_monitor_cover', - C: 'ae2:calculation_processor', - D: 'gtceu:hv_machine_casing', - E: 'computercraft:cable', - F: '#gtceu:circuits/hv', - }).id('tfg:crafting/monitor_advanced') + // Wireless Modem Advanced + event.shaped('computercraft:wireless_modem_advanced', [ + ' A ', + 'BCB', + ' D ' + ], { + A: 'ae2:wireless_receiver', + B: 'ae2:calculation_processor', + C: '#gtceu:circuits/hv', + D: 'computercraft:cable', + }).id('tfg:crafting/wireless_modem_advanced') - // Disk Drive - event.shaped('computercraft:disk_drive', [ - 'ABA', - 'CDC', - 'AEA' - ], { - A: 'computercraft:cable', - B: 'ae2:drive', - C: '#gtceu:circuits/mv', - D: 'gtceu:mv_machine_casing', - E: 'gtceu:mv_sensor', - }).id('tfg:crafting/disk_drive') + // Monitor Normal + event.shaped('computercraft:monitor_normal', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: 'gtceu:magnesium_diboride_single_wire', + B: 'gtceu:computer_monitor_cover', + C: 'ae2:calculation_processor', + D: 'gtceu:mv_machine_casing', + E: 'computercraft:cable', + F: '#gtceu:circuits/mv', + }).id('tfg:crafting/monitor_normal') - // Speaker - event.shaped('computercraft:speaker', [ - ' A ', - 'BCB', - ' D ' - ], { - A: 'minecraft:note_block', - B: 'computercraft:cable', - C: 'gtceu:mv_machine_casing', - D: '#gtceu:circuits/mv', - }).id('tfg:crafting/speaker') + // Monitor Advanced + event.shaped('computercraft:monitor_advanced', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: 'gtceu:mercury_barium_calcium_cuprate_single_wire', + B: 'gtceu:computer_monitor_cover', + C: 'ae2:calculation_processor', + D: 'gtceu:hv_machine_casing', + E: 'computercraft:cable', + F: '#gtceu:circuits/hv', + }).id('tfg:crafting/monitor_advanced') - // Printer - event.shaped('computercraft:printer', [ - 'ABC', - 'DED', - 'FBF' - ], { - A: 'gtceu:mv_electric_motor', - B: '#gtceu:circuits/mv', - C: 'gtceu:mv_robot_arm', - D: 'computercraft:cable', - E: 'gtceu:hv_machine_casing', - F: 'gtceu:mv_conveyor_module' - }).id('tfg:crafting/printer') + // Disk Drive + event.shaped('computercraft:disk_drive', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: 'computercraft:cable', + B: 'ae2:drive', + C: '#gtceu:circuits/mv', + D: 'gtceu:mv_machine_casing', + E: 'gtceu:mv_sensor', + }).id('tfg:crafting/disk_drive') - // Wired Modem - event.shaped('computercraft:wired_modem', [ - ' A ', - 'BCB', - 'BDB' - ], { - A: 'gtceu:mv_sensor', - B: 'computercraft:cable', - C: '#gtceu:circuits/mv', - D: 'ae2:calculation_processor', - }).id('tfg:crafting/wired_modem') + // Speaker + event.shaped('computercraft:speaker', [ + ' A ', + 'BCB', + ' D ' + ], { + A: 'minecraft:note_block', + B: 'computercraft:cable', + C: 'gtceu:mv_machine_casing', + D: '#gtceu:circuits/mv', + }).id('tfg:crafting/speaker') - event.shapeless('computercraft:wired_modem', ['computercraft:wired_modem_full']) - .id('tfg:crafting/wired_modem_shapeless') + // Printer + event.shaped('computercraft:printer', [ + 'ABC', + 'DED', + 'FBF' + ], { + A: 'gtceu:mv_electric_motor', + B: '#gtceu:circuits/mv', + C: 'gtceu:mv_robot_arm', + D: 'computercraft:cable', + E: 'gtceu:hv_machine_casing', + F: 'gtceu:mv_conveyor_module' + }).id('tfg:crafting/printer') - event.shapeless('computercraft:wired_modem_full', ['computercraft:wired_modem']) - .id('tfg:crafting/wired_modem_full_shapeless') + // Wired Modem + event.shaped('computercraft:wired_modem', [ + ' A ', + 'BCB', + 'BDB' + ], { + A: 'gtceu:mv_sensor', + B: 'computercraft:cable', + C: '#gtceu:circuits/mv', + D: 'ae2:calculation_processor', + }).id('tfg:crafting/wired_modem') - // Computer Normal + event.shapeless('computercraft:wired_modem', ['computercraft:wired_modem_full']) + .id('tfg:crafting/wired_modem_shapeless') + + event.shapeless('computercraft:wired_modem_full', ['computercraft:wired_modem']) + .id('tfg:crafting/wired_modem_full_shapeless') + + // Computer Normal event.recipes.gtceu.assembler('computercraft:assembler/computer_normal') - .itemInputs('1x gtceu:mv_machine_casing','2x #gtceu:circuits/hv','3x #forge:double_wires/magnesium_diboride', '2x #gtceu:batteries/mv', '4x computercraft:cable', '8x gtceu:cpu_chip', '1x gtceu:computer_monitor_cover') + .itemInputs('1x gtceu:mv_machine_casing', '2x #gtceu:circuits/hv', '3x #forge:double_wires/magnesium_diboride', '2x #gtceu:batteries/mv', '4x computercraft:cable', '8x gtceu:cpu_chip', '1x gtceu:computer_monitor_cover') .circuit(4) .itemOutputs('computercraft:computer_normal') .duration(1200) .EUt(GTValues.VA[GTValues.MV]) - // Computer Advanced + // Computer Advanced event.recipes.gtceu.assembler('computercraft:assembler/computer_advanced') - .itemInputs('1x gtceu:hv_machine_casing','2x #gtceu:circuits/ev','3x #forge:double_wires/mercury_barium_calcium_cuprate', '2x #gtceu:batteries/hv', '4x computercraft:cable', '12x gtceu:soc', '1x gtceu:computer_monitor_cover') + .itemInputs('1x gtceu:hv_machine_casing', '2x #gtceu:circuits/ev', '3x #forge:double_wires/mercury_barium_calcium_cuprate', '2x #gtceu:batteries/hv', '4x computercraft:cable', '12x gtceu:soc', '1x gtceu:computer_monitor_cover') .circuit(4) .itemOutputs('computercraft:computer_advanced') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) - // Turtle Normal + // Turtle Normal event.recipes.gtceu.assembler('computercraft:assembler/turtle_normal') - .itemInputs('1x computercraft:computer_normal','2x #gtceu:circuits/ev','1x gtceu:steel_crate', '2x gtceu:hv_conveyor_module', '2x gtceu:hv_robot_arm', '1x gtceu:hv_emitter', '1x gtceu:hv_sensor', '1x gtceu:hv_fluid_regulator') + .itemInputs('1x computercraft:computer_normal', '2x #gtceu:circuits/ev', '1x gtceu:steel_crate', '2x gtceu:hv_conveyor_module', '2x gtceu:hv_robot_arm', '1x gtceu:hv_emitter', '1x gtceu:hv_sensor', '1x gtceu:hv_fluid_regulator') .circuit(4) .itemOutputs('computercraft:turtle_normal') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) - // Turtle Advanced + // Turtle Advanced event.recipes.gtceu.assembler('computercraft:assembler/turtle_advanced') - .itemInputs('1x computercraft:computer_advanced','2x #gtceu:circuits/iv','1x gtceu:aluminium_crate', '2x gtceu:ev_conveyor_module', '2x gtceu:ev_robot_arm', '1x gtceu:ev_emitter', '1x gtceu:ev_sensor', '1x gtceu:ev_fluid_regulator') + .itemInputs('1x computercraft:computer_advanced', '2x #gtceu:circuits/iv', '1x gtceu:aluminium_crate', '2x gtceu:ev_conveyor_module', '2x gtceu:ev_robot_arm', '1x gtceu:ev_emitter', '1x gtceu:ev_sensor', '1x gtceu:ev_fluid_regulator') .circuit(4) .itemOutputs('computercraft:turtle_advanced') .duration(1200) .EUt(GTValues.VA[GTValues.EV]) - // Disk Crafts - for (let i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath('computercraft:disk' + `${global.MINECRAFT_DYE_NAMES[i]}`) - .itemInputs('ae2:blank_pattern') - .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 288)) - .itemOutputs(Item.of('computercraft:disk', global.COMPUTER_CRAFT_DISCS[i])) - .category(GTRecipeCategories.CHEM_DYES) - .duration(20) - .EUt(7) - } + // Disk Crafts + for (let i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath('computercraft:disk' + `${global.MINECRAFT_DYE_NAMES[i]}`) + .itemInputs('ae2:blank_pattern') + .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 288)) + .itemOutputs(Item.of('computercraft:disk', global.COMPUTER_CRAFT_DISCS[i])) + .category(GTRecipeCategories.CHEM_DYES) + .duration(20) + .EUt(7) + } - // Normal Pocket Computers - // Pocket Computer Normal - event.shaped('computercraft:pocket_computer_normal', [ - 'ABA', - 'CDE', - 'FGF' - ], { - A: 'ae2:wireless_receiver', - B: 'gtceu:mercury_barium_calcium_cuprate_single_wire', - C: '#gtceu:batteries/hv', - D: 'ae2:terminal', - E: 'gtceu:hv_emitter', - F: '#gtceu:circuits/ev', - G: '#forge:plates/titanium' - }).id('tfg:crafting/pocket_computer_normal') + // Normal Pocket Computers + // Pocket Computer Normal + event.shaped('computercraft:pocket_computer_normal', [ + 'ABA', + 'CDE', + 'FGF' + ], { + A: 'ae2:wireless_receiver', + B: 'gtceu:mercury_barium_calcium_cuprate_single_wire', + C: '#gtceu:batteries/hv', + D: 'ae2:terminal', + E: 'gtceu:hv_emitter', + F: '#gtceu:circuits/ev', + G: '#forge:plates/titanium' + }).id('tfg:crafting/pocket_computer_normal') - // Pocket Computer Normal Upgrade : Wireless Modem Advanced - event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [ - 'computercraft:pocket_computer_normal', - 'computercraft:wireless_modem_advanced' - ]).id('computercraft:ender_pocket_computer_normal_shapless') - - // Pocket Computer Normal Upgrade : Wireless Modem Normal - event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_normal"}'), [ - 'computercraft:pocket_computer_normal', - 'computercraft:wireless_modem_normal' - ]).id('computercraft:wireless_pocket_computer_normal_shapless') + // Pocket Computer Normal Upgrade : Wireless Modem Advanced + event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [ + 'computercraft:pocket_computer_normal', + 'computercraft:wireless_modem_advanced' + ]).id('computercraft:ender_pocket_computer_normal_shapless') - // Pocket Computer Normal Upgrade : Speaker - event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:speaker"}'), [ - 'computercraft:pocket_computer_normal', - 'computercraft:speaker' - ]).id('computercraft:noisy_pocket_computer_normal_shapless') + // Pocket Computer Normal Upgrade : Wireless Modem Normal + event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:wireless_modem_normal"}'), [ + 'computercraft:pocket_computer_normal', + 'computercraft:wireless_modem_normal' + ]).id('computercraft:wireless_pocket_computer_normal_shapless') - // Advanced Pocket Computers - // Pocket Computer Advanced - event.shaped('computercraft:pocket_computer_advanced', [ - 'ABA', - 'CDE', - 'FGF' - ], { - A: 'ae2:wireless_receiver', - B: 'gtceu:uranium_triplatinum_single_wire', - C: '#gtceu:batteries/ev', - D: 'ae2:terminal', - E: 'gtceu:ev_emitter', - F: '#gtceu:circuits/iv', - G: '#forge:plates/tungsten_steel' - }).id('tfg:crafting/pocket_computer_advanced') + // Pocket Computer Normal Upgrade : Speaker + event.shapeless(Item.of('computercraft:pocket_computer_normal', '{Upgrade:"computercraft:speaker"}'), [ + 'computercraft:pocket_computer_normal', + 'computercraft:speaker' + ]).id('computercraft:noisy_pocket_computer_normal_shapless') - // Pocket Computer Advanced Upgrade : Wireless Modem Advanced - event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [ - 'computercraft:pocket_computer_advanced', - 'computercraft:wireless_modem_advanced' - ]).id('computercraft:ender_pocket_computer_advanced_shapless') - - // Pocket Computer Advanced Upgrade : Wireless Modem Normal - event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_normal"}'), [ - 'computercraft:pocket_computer_advanced', - 'computercraft:wireless_modem_normal' - ]).id('computercraft:wireless_pocket_computer_advanced_shapless') + // Advanced Pocket Computers + // Pocket Computer Advanced + event.shaped('computercraft:pocket_computer_advanced', [ + 'ABA', + 'CDE', + 'FGF' + ], { + A: 'ae2:wireless_receiver', + B: 'gtceu:uranium_triplatinum_single_wire', + C: '#gtceu:batteries/ev', + D: 'ae2:terminal', + E: 'gtceu:ev_emitter', + F: '#gtceu:circuits/iv', + G: '#forge:plates/tungsten_steel' + }).id('tfg:crafting/pocket_computer_advanced') - // Pocket Computer Advanced Upgrade : Speaker - event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:speaker"}'), [ - 'computercraft:pocket_computer_advanced', - 'computercraft:speaker' - ]).id('computercraft:noisy_pocket_computer_advanced_shapless') + // Pocket Computer Advanced Upgrade : Wireless Modem Advanced + event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [ + 'computercraft:pocket_computer_advanced', + 'computercraft:wireless_modem_advanced' + ]).id('computercraft:ender_pocket_computer_advanced_shapless') - + // Pocket Computer Advanced Upgrade : Wireless Modem Normal + event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_normal"}'), [ + 'computercraft:pocket_computer_advanced', + 'computercraft:wireless_modem_normal' + ]).id('computercraft:wireless_pocket_computer_advanced_shapless') + + // Pocket Computer Advanced Upgrade : Speaker + event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:speaker"}'), [ + 'computercraft:pocket_computer_advanced', + 'computercraft:speaker' + ]).id('computercraft:noisy_pocket_computer_advanced_shapless') + + //Redstone Integrator + event.recipes.gtceu.assembler('computercraft:assembler/redstone_relay') + .itemInputs('1x computercraft:wired_modem', '1x gtceu:mv_machine_casing', '10x vintageimprovements:redstone_module', '1x ae2:redstone_card', '2x gtceu:transistor', '1x gtceu:mv_emitter') + .circuit(4) + .itemOutputs('computercraft:redstone_relay') + .duration(1200) + .EUt(GTValues.VA[GTValues.MV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/computer_craft/recipes.recycling.js b/kubejs/server_scripts/computer_craft/recipes.recycling.js index fa32b792a..9ca5e3105 100644 --- a/kubejs/server_scripts/computer_craft/recipes.recycling.js +++ b/kubejs/server_scripts/computer_craft/recipes.recycling.js @@ -10,7 +10,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 5), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.MagnesiumDiboride, 1) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 5) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -33,7 +33,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.MercuryBariumCalciumCuprate, 1) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 4) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -57,7 +57,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 12), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 20) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -82,7 +82,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 15), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 9), ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4) - ) + ) .duration(GTMaterials.Titanium.getMass() * 20) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -94,7 +94,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 15), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 9), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4) - ) + ) .duration(GTMaterials.Titanium.getMass() * 20) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -107,7 +107,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 4), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Platinum, 2) - ) + ) .duration(GTMaterials.Titanium.getMass() * 9) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -119,7 +119,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 4), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Platinum, 2) - ) + ) .duration(GTMaterials.Titanium.getMass() * 9) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -131,7 +131,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 9), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Platinum, 2) - ) + ) .duration(GTMaterials.Titanium.getMass() * 9) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -142,7 +142,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 9), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Platinum, 2) - ) + ) .duration(GTMaterials.Titanium.getMass() * 9) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -152,7 +152,7 @@ function registerComputerCraftRecyclingRecipes(event) { .itemInputs('computercraft:monitor_normal') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 5) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 5) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -161,7 +161,7 @@ function registerComputerCraftRecyclingRecipes(event) { .itemInputs('computercraft:monitor_normal') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 5) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 5) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -171,7 +171,7 @@ function registerComputerCraftRecyclingRecipes(event) { .itemInputs('computercraft:monitor_advanced') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 4) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -180,7 +180,7 @@ function registerComputerCraftRecyclingRecipes(event) { .itemInputs('computercraft:monitor_advanced') .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 4) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -193,7 +193,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Cupronickel, 15), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 6) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 15) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -205,7 +205,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Cupronickel, 15), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 6) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 15) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -217,7 +217,7 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 1) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -228,8 +228,32 @@ function registerComputerCraftRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 6), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 1), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) + + + // Redstone Relay + event.recipes.gtceu.macerator('computercraft:macerator/recycling/redstone_relay') + .itemInputs('computercraft:redstone_relay') + .itemOutputs( + ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedAlloy, 6), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Brass, 5), + ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4) + ) + .duration(GTMaterials.RedAlloy.getMass() * 6) + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/redstone_relay') + .itemInputs('computercraft:redstone_relay') + .itemOutputs( + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedAlloy, 6), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Brass, 5), + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4) + ) + .duration(GTMaterials.RedAlloy.getMass() * 6) + .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .EUt(GTValues.VA[GTValues.LV]) } \ No newline at end of file diff --git a/kubejs/startup_scripts/advancedperipherals/constants.js b/kubejs/startup_scripts/advancedperipherals/constants.js index cd152dbd6..3680e5292 100644 --- a/kubejs/startup_scripts/advancedperipherals/constants.js +++ b/kubejs/startup_scripts/advancedperipherals/constants.js @@ -8,6 +8,9 @@ global.ADVANCED_PERIPHERALS_DISABLED_ITEMS = [ 'advancedperipherals:colony_integrator', 'advancedperipherals:computer_tool', + // deprecated in favour of CC's redstone relay + 'advancedperipherals:redstone_integrator', + // banned for trans-dimensional travel 'advancedperipherals:overpowered_end_automata_core', // banned for offline chunk loading (bad for server performance)