diff --git a/CHANGELOG.md b/CHANGELOG.md index d19967181..1eb957fb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added more mineable tags to cobwebs since swords don't want to work @Pyritie - Added TACZ Ammo Boxes @BlueBoat29 - Added TACZ Guns and Ammo Boxes to tool rack @BlueBoat29 +- Overhauled the recycling recipes and added many more (#1576) @Pyritie ### Bug fixes - Fixed part of the tungsten processing loop giving way too much salt (#2095) @Redeix - Fixed basic super tanks so you can now left/right click with them in GUIs like you can with the others (#2100) @jurrejelle diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 0b279e142..c7935a8bd 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -10,14 +10,14 @@ const registerAdAstraRecipes = (event) => { //#region Rocket parts - event.shaped('ad_astra:launch_pad', [ + event.recipes.gtceu.shaped('ad_astra:launch_pad', [ 'BAB', 'AAA', 'BAB' ], { A: '#forge:plates/steel', B: '#forge:rods/steel' - }).id('tfg:launch_pad') + }).addMaterialInfo().id('tfg:launch_pad') //#region Tier 1 rocket @@ -135,6 +135,7 @@ const registerAdAstraRecipes = (event) => { .duration(180) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:rocket_cone_t2') .itemInputs('gtceu:ev_emitter', '#forge:dense_plates/rocket_alloy_t2', '#forge:double_plates/titanium', @@ -148,21 +149,22 @@ const registerAdAstraRecipes = (event) => { event.recipes.gtceu.assembler('tfg:rocket_desh_engine') .itemInputs( - '4x #forge:double_plates/titanium', + ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.Titanium, 4), '2x #gtceu:circuits/ev', 'gtceu:ev_electric_pump', '3x gtceu:advanced_power_thruster', - '4x #forge:rods/magnetic_neodymium', - '#forge:rotors/titanium') + ChemicalHelper.get(TagPrefix.rod, GTMaterials.NeodymiumMagnetic, 4), + ChemicalHelper.get(TagPrefix.rotor, GTMaterials.Titanium, 1)) .inputFluids(Fluid.of('gtceu:desh', 144 * 12)) .itemOutputs('ad_astra:desh_engine') .duration(800) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler('ad_astra:tier_2_rocket') .itemInputs( - '12x #forge:dense_plates/rocket_alloy_t2', + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t2'), 12), '4x tfg:rocket_fin_t2', '1x ad_astra:desh_engine', '1x tfg:rocket_cone_t2', @@ -174,6 +176,7 @@ const registerAdAstraRecipes = (event) => { .duration(1440) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) //#endregion @@ -203,6 +206,7 @@ const registerAdAstraRecipes = (event) => { .duration(220) .circuit(4) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:rocket_cone_t3') .itemInputs('gtceu:iv_emitter', '#forge:dense_plates/rocket_alloy_t3', '#forge:double_plates/tungsten_steel', @@ -211,6 +215,7 @@ const registerAdAstraRecipes = (event) => { .duration(1700) .circuit(4) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:elite_power_thruster') .itemInputs('gtceu:ev_electric_motor', '2x #forge:rings/titanium', '#forge:rods/titanium', @@ -218,6 +223,7 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('tfg:elite_power_thruster') .duration(200) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:rocket_ostrum_engine') .itemInputs( @@ -233,6 +239,7 @@ const registerAdAstraRecipes = (event) => { .duration(960) .circuit(4) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler('tfg:rocket_ostrum_tank') .itemInputs( @@ -245,6 +252,7 @@ const registerAdAstraRecipes = (event) => { .duration(400) .circuit(4) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler('ad_astra:tier_3_rocket') .itemInputs( @@ -260,6 +268,7 @@ const registerAdAstraRecipes = (event) => { .duration(1700) .circuit(4) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) //#endregion */ @@ -275,6 +284,7 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('2x tfg:space_suit_fabric') .duration(20 * 10) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) event.recipes.gtceu.forming_press('better_space_suit_fabric') .itemInputs( @@ -286,8 +296,9 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('2x tfg:better_space_suit_fabric') .duration(20 * 5) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) - event.shaped('ad_astra:space_helmet', [ + event.recipes.gtceu.shaped('ad_astra:space_helmet', [ 'AAA', 'ADA', 'BBB' @@ -295,7 +306,7 @@ const registerAdAstraRecipes = (event) => { A: 'gtceu:tempered_glass', B: 'tfg:space_suit_fabric', D: '#forge:small_fluid_pipes/polyethylene' - }).id('tfg:space_helmet') + }).addMaterialInfo().id('tfg:space_helmet') event.recipes.gtceu.assembler('ad_astra:netherite_space_helmet') .itemInputs( @@ -308,15 +319,16 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:netherite_space_helmet') .duration(400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) - event.shaped('ad_astra:space_suit', [ + event.recipes.gtceu.shaped('ad_astra:space_suit', [ 'B B', 'BDB', 'BBB' ], { B: 'tfg:space_suit_fabric', D: 'ad_astra:oxygen_gear' - }).id('tfg:space_suit') + }).addMaterialInfo().id('tfg:space_suit') event.shapeless('ad_astra:space_suit', ['ad_astra:space_suit']) .id('tfg:empty_space_suit') @@ -331,18 +343,19 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:netherite_space_suit') .duration(400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) event.shapeless('ad_astra:netherite_space_suit', ['ad_astra:netherite_space_suit']) .id('tfg:empty_netherite_space_suit') - event.shaped('ad_astra:space_pants', [ + event.recipes.gtceu.shaped('ad_astra:space_pants', [ 'BAB', 'B B', 'B B' ], { A: 'gtceu:hv_electric_motor', B: 'tfg:space_suit_fabric', - }).id('tfg:space_pants') + }).addMaterialInfo().id('tfg:space_pants') event.recipes.gtceu.assembler('ad_astra:netherite_space_pants') .itemInputs( @@ -354,14 +367,15 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:netherite_space_pants') .duration(400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) - event.shaped('ad_astra:space_boots', [ + event.recipes.gtceu.shaped('ad_astra:space_boots', [ 'B B', 'A A' ], { A: '#forge:plates/polyphenylene_sulfide', B: 'tfg:space_suit_fabric' - }).id('tfg:space_boots') + }).addMaterialInfo().id('tfg:space_boots') event.recipes.gtceu.assembler('ad_astra:netherite_space_boots') .itemInputs( @@ -373,9 +387,10 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:netherite_space_boots') .duration(400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) - event.shaped('ad_astra:oxygen_gear', [ + event.recipes.gtceu.shaped('ad_astra:oxygen_gear', [ 'BAB', 'ECE', 'BDB' @@ -385,13 +400,13 @@ const registerAdAstraRecipes = (event) => { C: 'gtceu:hv_electric_pump', D: 'gtceu:fluid_detector_cover', E: 'ad_astra:gas_tank' - }).id('tfg:oxygen_gear') + }).addMaterialInfo().id('tfg:oxygen_gear') //#endregion //#region Gas tanks - event.shaped('ad_astra:gas_tank', [ + event.recipes.gtceu.shaped('ad_astra:gas_tank', [ 'ABA', 'ACA', 'AAA' @@ -399,12 +414,12 @@ const registerAdAstraRecipes = (event) => { A: '#forge:foils/polyphenylene_sulfide', B: '#forge:tiny_fluid_pipes/polyethylene', C: 'gtceu:aluminium_fluid_cell' - }).id('tfg:gas_tank') + }).addMaterialInfo().id('tfg:gas_tank') event.shapeless('ad_astra:gas_tank', ['ad_astra:gas_tank']) .id('tfg:empty_gas_tank') - event.shaped('ad_astra:large_gas_tank', [ + event.recipes.gtceu.shaped('ad_astra:large_gas_tank', [ 'ABA', 'ACA', 'AAA' @@ -412,7 +427,7 @@ const registerAdAstraRecipes = (event) => { A: '#forge:sheets/polyphenylene_sulfide', B: '#forge:small_fluid_pipes/polyethylene', C: 'gtceu:stainless_steel_fluid_cell' - }).id('tfg:large_gas_tank') + }).addMaterialInfo().id('tfg:large_gas_tank') event.shapeless('ad_astra:large_gas_tank', ['ad_astra:large_gas_tank']) .id('tfg:empty_large_gas_tank') @@ -420,7 +435,7 @@ const registerAdAstraRecipes = (event) => { //#endregion //#region Machines - event.shaped('ad_astra:oxygen_distributor', [ + event.recipes.gtceu.shaped('ad_astra:oxygen_distributor', [ 'DBD', 'ACA', 'DBD' @@ -429,9 +444,9 @@ const registerAdAstraRecipes = (event) => { B: '#gtceu:circuits/hv', C: 'gtceu:hv_machine_hull', D: 'gtceu:filter_casing' - }).id('tfg:oxygen_distributor') + }).addMaterialInfo().id('tfg:oxygen_distributor') - event.shaped('ad_astra:gravity_normalizer', [ + event.recipes.gtceu.shaped('ad_astra:gravity_normalizer', [ 'A A', 'CBC', 'ADA' @@ -440,9 +455,9 @@ const registerAdAstraRecipes = (event) => { B: 'gtceu:mv_field_generator', C: '#forge:plates/titanium', D: 'gtceu:ev_polarizer', - }).id('tfg:gravity_normalizer') + }).addMaterialInfo().id('tfg:gravity_normalizer') - event.shaped('ad_astra:oxygen_sensor', [ + event.recipes.gtceu.shaped('ad_astra:oxygen_sensor', [ 'AEA', 'BDC', 'AAA' @@ -452,7 +467,7 @@ const registerAdAstraRecipes = (event) => { C: 'gtceu:fluid_detector_cover', D: 'gtceu:mv_machine_hull', E: '#gtceu:circuits/mv' - }).id('tfg:oxygen_sensor') + }).addMaterialInfo().id('tfg:oxygen_sensor') event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_silicon') .itemInputs('gtceu:silicon_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') @@ -478,7 +493,7 @@ const registerAdAstraRecipes = (event) => { .EUt(GTValues.VA[GTValues.MV]) .duration(100) - event.shaped('2x ad_astra:solar_panel', [ + event.recipes.gtceu.shaped('2x ad_astra:solar_panel', [ 'AAA', ' C ', 'BFE' @@ -488,13 +503,13 @@ const registerAdAstraRecipes = (event) => { C: '#forge:rods/long/aluminium', E: '#gtceu:circuits/mv', F: 'gtceu:mv_machine_hull' - }).id('tfg:solar_panel') + }).addMaterialInfo().id('tfg:solar_panel') //#endregion //#region Радио - event.shaped('ad_astra:radio', [ + event.recipes.gtceu.shaped('ad_astra:radio', [ 'AB ', 'CDC', 'CCC' @@ -503,20 +518,20 @@ const registerAdAstraRecipes = (event) => { B: '#forge:tools/screwdrivers', C: '#forge:plates/polyethylene', D: '#gtceu:circuits/lv' - }).id('tfg:radio') + }).addMaterialInfo().id('tfg:radio') //#endregion //#region Rover - event.shaped('ad_astra:wheel', [ + event.recipes.gtceu.shaped('ad_astra:wheel', [ ' A ', 'ABA', ' A ' ], { A: '#forge:plates/polyphenylene_sulfide', B: '#forge:rings/stainless_steel', - }).id('tfg:ad_astra_wheel') + }).addMaterialInfo().id('tfg:ad_astra_wheel') event.recipes.gtceu.assembler('tfg:tier_1_rover') .itemInputs( @@ -530,6 +545,7 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:tier_1_rover') .duration(400) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //#endregion @@ -799,6 +815,7 @@ const registerAdAstraRecipes = (event) => { .duration(100) .EUt(GTValues.VA[GTValues.LV]) .circuit(20) + .addMaterialInfo(true, true) }) event.shapeless('ad_astra:marked_iron_pillar', ['ad_astra:iron_pillar', '#forge:dyes/yellow', '#forge:dyes/black']) @@ -811,6 +828,7 @@ const registerAdAstraRecipes = (event) => { .duration(100) .EUt(GTValues.VA[GTValues.LV]) .circuit(21) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler(`tfg:ad_astra_airlock`) .itemInputs(`9x #forge:plates/steel`) @@ -819,6 +837,7 @@ const registerAdAstraRecipes = (event) => { .duration(100) .EUt(GTValues.VA[GTValues.LV]) .circuit(22) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler(`tfg:ad_astra_steel_door`) .itemInputs('createdeco:industrial_iron_door', '#forge:glass_panes') @@ -826,6 +845,7 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:steel_door') .duration(100) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler(`tfg:ad_astra_steel_trapdoor`) .itemInputs('tfc:metal/trapdoor/steel', '#forge:glass_panes') @@ -833,6 +853,7 @@ const registerAdAstraRecipes = (event) => { .itemOutputs('ad_astra:steel_trapdoor') .duration(100) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true, true) // Etrium only has factory block, encased block, plateblock, panel, and (storage) block diff --git a/kubejs/server_scripts/advancedperipherals/recipes.js b/kubejs/server_scripts/advancedperipherals/recipes.js index 543e4f6be..0caf35106 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.js @@ -3,8 +3,6 @@ const registerAdvancedPeripheralsRecipes = (event) => { - registerAdvancedPeripheralsRecyclingRecipes(event); - event.remove({ mod: 'advancedperipherals' }); //Chat Box @@ -14,6 +12,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:chat_box') .duration(1200) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) //Player Detector event.recipes.gtceu.assembler('advancedperipherals:assembler/player_detector') @@ -22,6 +21,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:player_detector') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //ME Bridge event.recipes.gtceu.assembler('advancedperipherals:assembler/me_bridge') @@ -30,6 +30,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:me_bridge') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //Environment Detector event.recipes.gtceu.assembler('advancedperipherals:assembler/environment_detector') @@ -39,6 +40,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:environment_detector') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //Inventory Manager event.recipes.gtceu.assembler('advancedperipherals:assembler/inventory_manager') @@ -47,6 +49,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:inventory_manager') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //Block Reader event.recipes.gtceu.assembler('advancedperipherals:assembler/block_reader') @@ -55,6 +58,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:block_reader') .duration(1200) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) //Geo Scanner event.recipes.gtceu.assembler('advancedperipherals:assembler/geo_scanner') @@ -63,6 +67,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:geo_scanner') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //NBT Storage event.recipes.gtceu.assembler('advancedperipherals:assembler/nbt_storage') @@ -71,6 +76,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:nbt_storage') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //End Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/end_automata_core') @@ -87,6 +93,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:husbandry_automata_core') .duration(2400) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //Weak Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/weak_automata_core') @@ -95,6 +102,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:weak_automata_core') .duration(2400) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) //Overpowered Husbandry Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/overpowered_husbandry_automata_core') @@ -103,6 +111,7 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:overpowered_husbandry_automata_core') .duration(2400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) //Overpowered Weak Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/overpowered_weak_automata_core') @@ -111,9 +120,10 @@ const registerAdvancedPeripheralsRecipes = (event) => { .itemOutputs('advancedperipherals:overpowered_weak_automata_core') .duration(2400) .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true) //Memory Card - event.shaped('advancedperipherals:memory_card', [ + event.recipes.gtceu.shaped('advancedperipherals:memory_card', [ 'A', 'B', 'C' @@ -121,5 +131,5 @@ const registerAdvancedPeripheralsRecipes = (event) => { A: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Polyethylene, 1), B: 'computercraft:disk', C: ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.Gold, 1) - }).id('advancedperipherals:shaped/memory_card') + }).addMaterialInfo().id('advancedperipherals:shaped/memory_card') } \ No newline at end of file diff --git a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js deleted file mode 100644 index 2950f4d3a..000000000 --- a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js +++ /dev/null @@ -1,339 +0,0 @@ -// priority: 0 -"use strict"; - -function registerAdvancedPeripheralsRecyclingRecipes(event) { - - // Chat Box - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/chat_box') - .itemInputs('advancedperipherals:chat_box') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 12), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Emerald, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/chat_box') - .itemInputs('advancedperipherals:chat_box') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 12), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 5), - ChemicalHelper.get(TagPrefix.gemFlawless, GTMaterials.Emerald, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Player Detector - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/player_detector') - .itemInputs('advancedperipherals:player_detector') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 24), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 19), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.MercuryBariumCalciumCuprate, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3) - ) - .duration(GTMaterials.Electrum.getMass() * 24) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/player_detector') - .itemInputs('advancedperipherals:player_detector') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 24), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 19), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.MercuryBariumCalciumCuprate, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3) - ) - .duration(GTMaterials.Electrum.getMass() * 24) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // ME Bridge - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/me_bridge') - .itemInputs('advancedperipherals:me_bridge') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 19), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.CertusQuartz, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 19) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/me_bridge') - .itemInputs('advancedperipherals:me_bridge') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 19), - ChemicalHelper.get(TagPrefix.gem, GTMaterials.CertusQuartz, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 19) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Environment Detector - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/environment_detector') - .itemInputs('advancedperipherals:environment_detector') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 8) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/environment_detector') - .itemInputs('advancedperipherals:environment_detector') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 8) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Inventory Manager - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/inventory_manager') - .itemInputs('advancedperipherals:inventory_manager') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Cupronickel, 24), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 14), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8)) - .duration(GTMaterials.Cupronickel.getMass() * 24) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/inventory_manager') - .itemInputs('advancedperipherals:inventory_manager') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Cupronickel, 24), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 14), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8)) - .duration(GTMaterials.Cupronickel.getMass() * 24) - .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') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 1) - ) - .duration(GTMaterials.Steel.getMass() * 6) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/block_reader') - .itemInputs('advancedperipherals:block_reader') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 1) - ) - .duration(GTMaterials.Steel.getMass() * 6) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Geo Scanner - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/geo_scanner') - .itemInputs('advancedperipherals:geo_scanner') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 3) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/geo_scanner') - .itemInputs('advancedperipherals:geo_scanner') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 3) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // NBT Storage - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/nbt_storage') - .itemInputs('advancedperipherals:nbt_storage') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 1), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 1) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 10) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/nbt_storage') - .itemInputs('advancedperipherals:nbt_storage') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 10), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 1), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 10) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Memory Card - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/memory_card') - .itemInputs('advancedperipherals:memory_card') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Gold, 1) - ) - .duration(GTMaterials.Steel.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/memory_card') - .itemInputs('advancedperipherals:memory_card') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Gold, 1) - ) - .duration(GTMaterials.Steel.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // End Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/end_automata_core') - .itemInputs('advancedperipherals:end_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.HSSS, 37), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruridit, 12), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.NiobiumTitanium, 3), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Samarium, 2) - ) - .duration(GTMaterials.HSSS.getMass() * 37) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/end_automata_core') - .itemInputs('advancedperipherals:end_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 37), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ruridit, 12), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.NiobiumTitanium, 3), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Samarium, 2) - ) - .duration(GTMaterials.HSSS.getMass() * 37) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Husbandry Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/husbandry_automata_core') - .itemInputs('advancedperipherals:husbandry_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueSteel, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/husbandry_automata_core') - .itemInputs('advancedperipherals:husbandry_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueSteel, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Weak Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/weak_automata_core') - .itemInputs('advancedperipherals:weak_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 22), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 16), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3) - ) - .duration(GTMaterials.Electrum.getMass() * 22) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/weak_automata_core') - .itemInputs('advancedperipherals:weak_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 22), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 16), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3) - ) - .duration(GTMaterials.Electrum.getMass() * 22) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Overpowered Husbandry Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/overpowered_husbandry_automata_core') - .itemInputs('advancedperipherals:overpowered_husbandry_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.HSSS, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueSteel, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/overpowered_husbandry_automata_core') - .itemInputs('advancedperipherals:overpowered_husbandry_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueSteel, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Overpowered Weak Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/overpowered_weak_automata_core') - .itemInputs('advancedperipherals:overpowered_weak_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 22), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 16), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8) - ) - .duration(GTMaterials.Electrum.getMass() * 22) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/overpowered_weak_automata_core') - .itemInputs('advancedperipherals:overpowered_weak_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 22), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 16), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8) - ) - .duration(GTMaterials.Electrum.getMass() * 22) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) -} \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 4bdd1f24a..1c5087d56 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -17,10 +17,10 @@ const registerAE2Recipes = (event) => { ], mod: 'ae2' }); - event.remove( { output: 'ae2:fe_p2p_tunnel' } ) + event.remove({ output: 'ae2:fe_p2p_tunnel' }) // Cutting knives (for renaming things) - event.shaped('ae2:certus_quartz_cutting_knife', [ + event.recipes.gtceu.shaped('ae2:certus_quartz_cutting_knife', [ ' A', 'BA ', 'CCB', @@ -30,7 +30,7 @@ const registerAE2Recipes = (event) => { C: '#forge:exquisite_gems/certus_quartz', }).id('tfg:crafting/certus_quartz_cutting_knife') - event.shaped('ae2:nether_quartz_cutting_knife', [ + event.recipes.gtceu.shaped('ae2:nether_quartz_cutting_knife', [ ' A', 'BA ', 'CCB', @@ -41,7 +41,7 @@ const registerAE2Recipes = (event) => { }).id('tfg:crafting/nether_quartz_cutting_knife') // Network tool - event.shaped('ae2:network_tool', [ + event.recipes.gtceu.shaped('ae2:network_tool', [ 'AB', 'CD', ], { @@ -52,7 +52,7 @@ const registerAE2Recipes = (event) => { }).id('tfg:crafting/network_tool') // Wireless Access Point - event.shaped('ae2:wireless_access_point', [ + event.recipes.gtceu.shaped('ae2:wireless_access_point', [ 'A', 'B', 'C' @@ -60,10 +60,10 @@ const registerAE2Recipes = (event) => { A: 'ae2:wireless_receiver', B: 'ae2:calculation_processor', C: '#ae2:glass_cable', - }).id('tfg:crafting/wireless_access_point') + }).addMaterialInfo().id('tfg:crafting/wireless_access_point') // Wireless Receiver - event.shaped('ae2:wireless_receiver', [ + event.recipes.gtceu.shaped('ae2:wireless_receiver', [ 'ABA', 'CDC', 'AEA' @@ -73,10 +73,10 @@ const registerAE2Recipes = (event) => { C: 'gtceu:ev_sensor', D: '#forge:rods/titanium', E: '#gtceu:circuits/ev' - }).id('tfg:crafting/wireless_receiver') + }).addMaterialInfo().id('tfg:crafting/wireless_receiver') // Illuminated Panel - event.shaped('ae2:semi_dark_monitor', [ + event.recipes.gtceu.shaped('ae2:semi_dark_monitor', [ ' AD', 'BCD', ' AD' @@ -85,10 +85,10 @@ const registerAE2Recipes = (event) => { B: '#forge:plates/aluminium', C: '#forge:plates/red_alloy', D: 'ae2:quartz_glass' - }).id('tfg:crafting/semi_dark_monitor') + }).addMaterialInfo().id('tfg:crafting/semi_dark_monitor') // Toggle Bus - event.shaped('ae2:toggle_bus', [ + event.recipes.gtceu.shaped('ae2:toggle_bus', [ ' A ', 'BCB', ' A ' @@ -96,40 +96,40 @@ const registerAE2Recipes = (event) => { A: '#forge:plates/red_alloy', B: '#ae2:glass_cable', C: 'minecraft:lever' - }).id('tfg:crafting/toggle_bus') + }).addMaterialInfo().id('tfg:crafting/toggle_bus') // Capacity Card - event.shaped('ae2:capacity_card', [ + event.recipes.gtceu.shaped('ae2:capacity_card', [ 'AB', 'BC', ], { A: 'ae2:basic_card', B: 'ae2:cell_component_1k', C: '#forge:gems/certus_quartz' - }).id('tfg:crafting/capacity_card') + }).addMaterialInfo().id('tfg:crafting/capacity_card') // Crafting Card - event.shaped('ae2:crafting_card', [ + event.recipes.gtceu.shaped('ae2:crafting_card', [ 'AB', 'BC', ], { A: 'ae2:basic_card', B: 'ae2:cell_component_1k', C: '#tfc:workbenches' - }).id('tfg:crafting/crafting_card') + }).addMaterialInfo().id('tfg:crafting/crafting_card') // Redstone Card - event.shaped('ae2:redstone_card', [ + event.recipes.gtceu.shaped('ae2:redstone_card', [ 'AB', 'BC' ], { A: 'ae2:basic_card', B: 'minecraft:redstone_torch', C: 'ae2:calculation_processor' - }).id('tfg:crafting/redstone_card') + }).addMaterialInfo().id('tfg:crafting/redstone_card') // Fuzzy Card - event.shaped('ae2:fuzzy_card', [ + event.recipes.gtceu.shaped('ae2:fuzzy_card', [ 'AB', 'CD', ], { @@ -137,20 +137,20 @@ const registerAE2Recipes = (event) => { B: 'ae2:engineering_processor', C: 'ae2:logic_processor', D: 'ae2:calculation_processor' - }).id('tfg:crafting/fuzzy_card') + }).addMaterialInfo().id('tfg:crafting/fuzzy_card') // Inverter Card - event.shaped('ae2:inverter_card', [ + event.recipes.gtceu.shaped('ae2:inverter_card', [ 'AB', 'BC', ], { A: 'ae2:advanced_card', B: 'ae2:inverted_toggle_bus', C: 'ae2:calculation_processor' - }).id('tfg:crafting/inverter_card') + }).addMaterialInfo().id('tfg:crafting/inverter_card') // Acceleration Card - event.shaped('ae2:speed_card', [ + event.recipes.gtceu.shaped('ae2:speed_card', [ 'AB', 'CD', ], { @@ -158,17 +158,17 @@ const registerAE2Recipes = (event) => { B: 'ae2:engineering_processor', C: 'ae2:logic_processor', D: '#forge:gems/fluix' - }).id('tfg:crafting/speed_card') + }).addMaterialInfo().id('tfg:crafting/speed_card') //Auto Crafting Card - event.shaped('ae2:auto_complete_card', [ + event.recipes.gtceu.shaped('ae2:auto_complete_card', [ 'AB', 'BC' ], { A: 'ae2:advanced_card', B: 'ae2:engineering_processor', C: 'ae2:calculation_processor' - }).id('tfg:crafting/auto_complete_card') + }).addMaterialInfo().id('tfg:crafting/auto_complete_card') // Void Card event.shapeless('ae2:void_card', ['ae2:basic_card', 'ae2:calculation_processor']) @@ -195,7 +195,7 @@ const registerAE2Recipes = (event) => { ]).id('tfg:crafting/light_detector') // Wireless Terminal - event.shaped('ae2:wireless_terminal', [ + event.recipes.gtceu.shaped('ae2:wireless_terminal', [ 'ABA', 'CDC', 'FEF' @@ -206,10 +206,10 @@ const registerAE2Recipes = (event) => { D: '#gtceu:circuits/hv', E: '#gtceu:batteries/hv', F: '#forge:plates/certus_quartz' - }).id('tfg:crafting/wireless_terminal') + }).addMaterialInfo().id('tfg:crafting/wireless_terminal') // Basic Card - event.shaped('2x ae2:basic_card', [ + event.recipes.gtceu.shaped('2x ae2:basic_card', [ 'AB ', 'CDB', 'EB ' @@ -219,10 +219,10 @@ const registerAE2Recipes = (event) => { C: 'ae2:calculation_processor', D: '#gtceu:circuits/mv', E: '#forge:fine_wires/gold' - }).id('tfg:crafting/basic_card') + }).addMaterialInfo().id('tfg:crafting/basic_card') // Advanced Card - event.shaped('2x ae2:advanced_card', [ + event.recipes.gtceu.shaped('2x ae2:advanced_card', [ 'AB ', 'CDB', 'EB ' @@ -232,10 +232,10 @@ const registerAE2Recipes = (event) => { C: 'ae2:calculation_processor', D: '#gtceu:circuits/hv', E: '#forge:fine_wires/silver' - }).id('tfg:crafting/advanced_card') + }).addMaterialInfo().id('tfg:crafting/advanced_card') // Wireless Booster - event.shaped('ae2:wireless_booster', [ + event.recipes.gtceu.shaped('ae2:wireless_booster', [ 'ABC', 'DDD', ], { @@ -243,20 +243,20 @@ const registerAE2Recipes = (event) => { B: '#forge:gems/certus_quartz', C: '#forge:plates/ender_pearl', D: '#forge:plates/titanium', - }).id('tfg:crafting/wireless_booster') + }).addMaterialInfo().id('tfg:crafting/wireless_booster') - event.shaped('ae2:wireless_booster', [ - 'ABC', - 'DDD', - ], { - A: '#forge:dusts/fluix', - B: '#forge:gems/certus_quartz', - C: '#forge:plates/ender_pearl', - D: 'minecraft:shulker_shell', - }).id('tfg:crafting/wireless_booster_shulker') + event.recipes.gtceu.shaped('ae2:wireless_booster', [ + 'ABC', + 'DDD', + ], { + A: '#forge:dusts/fluix', + B: '#forge:gems/certus_quartz', + C: '#forge:plates/ender_pearl', + D: 'minecraft:shulker_shell', + }).id('tfg:crafting/wireless_booster_shulker') // Memory Card - event.shaped('ae2:memory_card', [ + event.recipes.gtceu.shaped('ae2:memory_card', [ 'ABB', 'CDC', ], { @@ -264,10 +264,10 @@ const registerAE2Recipes = (event) => { B: '#forge:plates/wrought_iron', C: '#forge:plates/gold', D: '#forge:plates/red_alloy', - }).id('tfg:crafting/memory_card') + }).addMaterialInfo().id('tfg:crafting/memory_card') // Item Cell Housing - event.shaped('ae2:item_cell_housing', [ + event.recipes.gtceu.shaped('ae2:item_cell_housing', [ 'ABA', 'CDC', 'BBB' @@ -276,10 +276,10 @@ const registerAE2Recipes = (event) => { B: '#forge:plates/steel', C: '#forge:fine_wires/red_alloy', D: '#gtceu:circuits/lv', - }).id('tfg:crafting/item_cell_housing') + }).addMaterialInfo().id('tfg:crafting/item_cell_housing') // Fluid Cell Housing - event.shaped('ae2:fluid_cell_housing', [ + event.recipes.gtceu.shaped('ae2:fluid_cell_housing', [ 'ABA', 'CDC', 'BBB' @@ -288,10 +288,10 @@ const registerAE2Recipes = (event) => { B: '#forge:plates/stainless_steel', C: '#forge:fine_wires/red_alloy', D: '#gtceu:circuits/lv', - }).id('tfg:crafting/fluid_cell_housing') + }).addMaterialInfo().id('tfg:crafting/fluid_cell_housing') // Level Emitter - event.shaped('ae2:level_emitter', [ + event.recipes.gtceu.shaped('ae2:level_emitter', [ 'DA ', 'BCB', ' A ' @@ -300,10 +300,10 @@ const registerAE2Recipes = (event) => { B: '#ae2:glass_cable', C: 'minecraft:redstone_torch', D: 'ae2:calculation_processor', - }).id('tfg:crafting/level_emitter') + }).addMaterialInfo().id('tfg:crafting/level_emitter') // Energy Level Emitter - event.shaped('ae2:energy_level_emitter', [ + event.recipes.gtceu.shaped('ae2:energy_level_emitter', [ 'DAE', 'BCB', ' A ' @@ -313,10 +313,10 @@ const registerAE2Recipes = (event) => { C: 'minecraft:redstone_torch', D: 'ae2:calculation_processor', E: 'ae2:charged_certus_quartz_crystal' - }).id('tfg:crafting/energy_level_emitter') + }).addMaterialInfo().id('tfg:crafting/energy_level_emitter') // P2P Tunnel - event.shaped('2x ae2:me_p2p_tunnel', [ + event.recipes.gtceu.shaped('2x ae2:me_p2p_tunnel', [ 'ABA', 'BCB', 'DDD' @@ -325,10 +325,10 @@ const registerAE2Recipes = (event) => { B: '#forge:plates/aluminium', C: '#ae2:illuminated_panel', D: '#forge:gems/fluix', - }).id('tfg:crafting/me_p2p_tunnel') + }).addMaterialInfo().id('tfg:crafting/me_p2p_tunnel') // ME Chest - event.shaped('ae2:chest', [ + event.recipes.gtceu.shaped('ae2:chest', [ 'AEA', 'CDC', 'ABA' @@ -338,47 +338,47 @@ const registerAE2Recipes = (event) => { C: '#ae2:glass_cable', D: 'gtceu:aluminium_crate', E: 'ae2:terminal' - }).id('tfg:crafting/me_chest') + }).addMaterialInfo().id('tfg:crafting/me_chest') - // ME Drive - event.shaped('ae2:drive', [ - 'ABA', - 'CDC', - 'EBE' - ], { - A: '#forge:plates/steel', - B: 'ae2:engineering_processor', - C: '#ae2:glass_cable', - D: '#gtceu:circuits/mv', - E: '#forge:plates/titanium' - }).id('tfg:crafting/drive') + // ME Drive + event.recipes.gtceu.shaped('ae2:drive', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: '#forge:plates/steel', + B: 'ae2:engineering_processor', + C: '#ae2:glass_cable', + D: '#gtceu:circuits/mv', + E: '#forge:plates/titanium' + }).addMaterialInfo().id('tfg:crafting/drive') - event.shaped('ae2:drive', [ - 'ABA', - 'CDC', - 'EBE' - ], { - A: '#forge:plates/steel', - B: 'ae2:engineering_processor', - C: '#ae2:glass_cable', - D: '#gtceu:circuits/mv', - E: 'minecraft:shulker_shell' - }).id('tfg:crafting/drive_shulker') + event.recipes.gtceu.shaped('ae2:drive', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: '#forge:plates/steel', + B: 'ae2:engineering_processor', + C: '#ae2:glass_cable', + D: '#gtceu:circuits/mv', + E: 'minecraft:shulker_shell' + }).id('tfg:crafting/drive_shulker') - // Spatial Pylon - event.shaped('ae2:spatial_pylon', [ - 'ABA', - 'CDC', - 'ABA' - ], { - A: '#forge:plates/glass', - B: '#ae2:glass_cable', - C: '#forge:dusts/fluix', - D: '#forge:gems/fluix', - }).id('tfg:crafting/spatial_pylon') + // Spatial Pylon + event.recipes.gtceu.shaped('ae2:spatial_pylon', [ + 'ABA', + 'CDC', + 'ABA' + ], { + A: '#forge:plates/glass', + B: '#ae2:glass_cable', + C: '#forge:dusts/fluix', + D: '#forge:gems/fluix', + }).addMaterialInfo().id('tfg:crafting/spatial_pylon') // IO Port - event.shaped('ae2:io_port', [ + event.recipes.gtceu.shaped('ae2:io_port', [ 'AAA', 'BCB', 'DED' @@ -388,57 +388,57 @@ const registerAE2Recipes = (event) => { C: '#ae2:glass_cable', D: '#forge:plates/titanium', E: 'ae2:engineering_processor' - }).id('tfg:crafting/io_port') + }).addMaterialInfo().id('tfg:crafting/io_port') - event.shaped('ae2:io_port', [ - 'AAA', - 'BCB', - 'DED' - ], { - A: '#forge:plates/glass', - B: 'ae2:drive', - C: '#ae2:glass_cable', - D: 'minecraft:shulker_shell', - E: 'ae2:engineering_processor' - }).id('tfg:crafting/io_port_shulker') + event.recipes.gtceu.shaped('ae2:io_port', [ + 'AAA', + 'BCB', + 'DED' + ], { + A: '#forge:plates/glass', + B: 'ae2:drive', + C: '#ae2:glass_cable', + D: 'minecraft:shulker_shell', + E: 'ae2:engineering_processor' + }).id('tfg:crafting/io_port_shulker') - // Spatial IO Port - event.shaped('ae2:spatial_io_port', [ - 'AAA', - 'BCB', - 'DED' - ], { - A: '#forge:plates/glass', - B: '#ae2:glass_cable', - C: 'ae2:io_port', - D: '#forge:plates/titanium', - E: 'ae2:engineering_processor' - }).id('tfg:crafting/spatial_io_port') + // Spatial IO Port + event.recipes.gtceu.shaped('ae2:spatial_io_port', [ + 'AAA', + 'BCB', + 'DED' + ], { + A: '#forge:plates/glass', + B: '#ae2:glass_cable', + C: 'ae2:io_port', + D: '#forge:plates/titanium', + E: 'ae2:engineering_processor' + }).addMaterialInfo().id('tfg:crafting/spatial_io_port') - event.shaped('ae2:spatial_io_port', [ - 'AAA', - 'BCB', - 'DED' - ], { - A: '#forge:plates/glass', - B: '#ae2:glass_cable', - C: 'ae2:io_port', - D: 'minecraft:shulker_shell', - E: 'ae2:engineering_processor' - }).id('tfg:crafting/spatial_io_port_shulker') + event.recipes.gtceu.shaped('ae2:spatial_io_port', [ + 'AAA', + 'BCB', + 'DED' + ], { + A: '#forge:plates/glass', + B: '#ae2:glass_cable', + C: 'ae2:io_port', + D: 'minecraft:shulker_shell', + E: 'ae2:engineering_processor' + }).id('tfg:crafting/spatial_io_port_shulker') - // Monitors - event.shapeless('ae2:semi_dark_monitor', ['ae2:dark_monitor']) - .id('tfg:crafting/semi_dark_monitor_2') - - event.shapeless('ae2:dark_monitor', ['ae2:monitor']) - .id('tfg:crafting/dark_monitor') - - event.shapeless('ae2:monitor', ['ae2:semi_dark_monitor']) - .id('tfg:crafting/monitor') + // Monitors + event.shapeless('ae2:semi_dark_monitor', ['ae2:dark_monitor']) + .id('tfg:crafting/semi_dark_monitor_2') + + event.shapeless('ae2:dark_monitor', ['ae2:monitor']) + .id('tfg:crafting/dark_monitor') + + event.shapeless('ae2:monitor', ['ae2:semi_dark_monitor']) + .id('tfg:crafting/monitor') // Cell Workbench - event.shaped('ae2:cell_workbench', [ + event.recipes.gtceu.shaped('ae2:cell_workbench', [ 'ABC', 'DED', 'DDD' @@ -448,10 +448,10 @@ const registerAE2Recipes = (event) => { C: 'gtceu:fluid_filter', D: '#forge:plates/aluminium', E: 'ae2:calculation_processor', - }).id('tfg:crafting/cell_workbench') + }).addMaterialInfo().id('tfg:crafting/cell_workbench') // Matter Condenser - event.shaped('ae2:condenser', [ + event.recipes.gtceu.shaped('ae2:condenser', [ 'ABA', 'BCB', 'ABA' @@ -459,7 +459,7 @@ const registerAE2Recipes = (event) => { A: '#forge:plates/stainless_steel', B: 'gtceu:hv_electric_piston', C: '#gtceu:circuits/hv', - }).id('tfg:crafting/condenser') + }).addMaterialInfo().id('tfg:crafting/condenser') // Toggle Bus event.shapeless('ae2:toggle_bus', ['ae2:inverted_toggle_bus']) @@ -469,27 +469,27 @@ const registerAE2Recipes = (event) => { .id('tfg:crafting/inverted_toggle_bus') // ME Annihilation Plane - event.shaped('ae2:annihilation_plane', [ + event.recipes.gtceu.shaped('ae2:annihilation_plane', [ 'AAA', 'CBC' ], { A: '#forge:gems/fluix', B: 'ae2:annihilation_core', C: '#forge:plates/aluminium' - }).id('tfg:crafting/annihilation_plane') + }).addMaterialInfo().id('tfg:crafting/annihilation_plane') // ME Formation Plane - event.shaped('ae2:formation_plane', [ + event.recipes.gtceu.shaped('ae2:formation_plane', [ 'AAA', 'CBC' ], { A: '#forge:gems/fluix', B: 'ae2:formation_core', C: '#forge:plates/aluminium' - }).id('tfg:crafting/formation_plane') + }).addMaterialInfo().id('tfg:crafting/formation_plane') // ME Terminal - event.shaped('ae2:terminal', [ + event.recipes.gtceu.shaped('ae2:terminal', [ 'ABC', 'DED', 'FGF' @@ -503,19 +503,20 @@ const registerAE2Recipes = (event) => { G: '#forge:screws/steel' }).id('tfg:crafting/terminal') - event.recipes.gtceu.assembler('assembler:ae2_terminal') - .itemInputs( - '#ae2:illuminated_panel', - '2x #forge:rods/steel', - '#gtceu:circuits/hv', - '2x #forge:plates/steel', - '#forge:screws/steel') - .itemOutputs('ae2:terminal') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('assembler:ae2_terminal') + .itemInputs( + '#ae2:illuminated_panel', + '2x #forge:rods/steel', + '#gtceu:circuits/hv', + '2x #forge:plates/steel', + '#forge:screws/steel') + .itemOutputs('ae2:terminal') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) // ME Crafting Terminal - event.shaped('ae2:crafting_terminal', [ + event.recipes.gtceu.shaped('ae2:crafting_terminal', [ 'ABC', 'DED', 'FGF' @@ -529,19 +530,20 @@ const registerAE2Recipes = (event) => { G: 'ae2:engineering_processor' }).id('tfg:crafting/crafting_terminal') - event.recipes.gtceu.assembler('assembler:ae2_crafting_terminal') - .itemInputs( - 'ae2:terminal', - '2x #forge:rods/steel', - 'ae2:engineering_processor', - '2x #forge:plates/steel', - '#tfc:workbenches') - .itemOutputs('ae2:crafting_terminal') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('assembler:ae2_crafting_terminal') + .itemInputs( + 'ae2:terminal', + '2x #forge:rods/steel', + 'ae2:engineering_processor', + '2x #forge:plates/steel', + '#tfc:workbenches') + .itemOutputs('ae2:crafting_terminal') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) // pattern access terminal - event.shaped('ae2:pattern_access_terminal', [ + event.recipes.gtceu.shaped('ae2:pattern_access_terminal', [ 'ABC', 'DED', 'FGF' @@ -555,19 +557,20 @@ const registerAE2Recipes = (event) => { G: 'ae2:engineering_processor' }).id('tfg:crafting/pattern_access_terminal') - event.recipes.gtceu.assembler('assembler:ae2_pattern_access_terminal') - .itemInputs( - 'ae2:terminal', - '2x #forge:rods/steel', - 'ae2:engineering_processor', - '2x #forge:plates/steel', - '#ae2:pattern_provider') - .itemOutputs('ae2:pattern_access_terminal') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('assembler:ae2_pattern_access_terminal') + .itemInputs( + 'ae2:terminal', + '2x #forge:rods/steel', + 'ae2:engineering_processor', + '2x #forge:plates/steel', + '#ae2:pattern_provider') + .itemOutputs('ae2:pattern_access_terminal') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) // ME Pattern Terminal - event.shaped('ae2:pattern_encoding_terminal', [ + event.recipes.gtceu.shaped('ae2:pattern_encoding_terminal', [ 'ABC', 'DED', 'FGF' @@ -581,19 +584,20 @@ const registerAE2Recipes = (event) => { G: 'ae2:engineering_processor' }).id('tfg:crafting/pattern_encoding_terminal') - event.recipes.gtceu.assembler('assembler:ae2_pattern_encoding_terminal') - .itemInputs( - 'ae2:terminal', - '2x #forge:rods/steel', - 'ae2:engineering_processor', - '2x #forge:plates/steel', - 'ae2:blank_pattern') - .itemOutputs('ae2:pattern_encoding_terminal') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.assembler('assembler:ae2_pattern_encoding_terminal') + .itemInputs( + 'ae2:terminal', + '2x #forge:rods/steel', + 'ae2:engineering_processor', + '2x #forge:plates/steel', + 'ae2:blank_pattern') + .itemOutputs('ae2:pattern_encoding_terminal') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) // Matter Cannon - event.shaped('ae2:matter_cannon', [ + event.recipes.gtceu.shaped('ae2:matter_cannon', [ 'AAB', 'CD ', 'A ' @@ -602,10 +606,10 @@ const registerAE2Recipes = (event) => { B: 'ae2:formation_core', C: 'ae2:cell_component_4k', D: 'gtceu:hv_lithium_battery' - }).id('tfg:crafting/matter_cannon') + }).addMaterialInfo().id('tfg:crafting/matter_cannon') // Color Applicator - event.shaped('ae2:color_applicator', [ + event.recipes.gtceu.shaped('ae2:color_applicator', [ 'ABA', 'CDC', ' E ' @@ -615,7 +619,7 @@ const registerAE2Recipes = (event) => { C: 'ae2:cell_component_4k', D: 'gtceu:hv_lithium_battery', E: '#forge:rods/steel', - }).id('tfg:crafting/color_applicator') + }).addMaterialInfo().id('tfg:crafting/color_applicator') // Energy Cell event.recipes.gtceu.assembler('tfg:ae2/energy_cell') @@ -624,6 +628,7 @@ const registerAE2Recipes = (event) => { .circuit(1) .duration(960) .EUt(256) + .addMaterialInfo(true) // Dense Energy Cell event.recipes.gtceu.assembler('tfg:ae2/dense_energy_cell') @@ -632,6 +637,7 @@ const registerAE2Recipes = (event) => { .circuit(1) .duration(960) .EUt(512) + .addMaterialInfo(true) // Energy Acceptor event.recipes.gtceu.assembler('tfg:ae2/energy_acceptor') @@ -640,6 +646,7 @@ const registerAE2Recipes = (event) => { .circuit(1) .duration(520) .EUt(128) + .addMaterialInfo(true) // Glass Cable event.recipes.gtceu.assembler('fluix_glass_cable') @@ -652,6 +659,7 @@ const registerAE2Recipes = (event) => { .circuit(1) .duration(20) .EUt(480) + .addMaterialInfo(true) // Covered Cable event.recipes.gtceu.assembler('fluix_covered_cable_rubber') @@ -666,7 +674,7 @@ const registerAE2Recipes = (event) => { event.recipes.gtceu.assembler('fluix_covered_cable_silicone_rubber') .itemInputs( 'ae2:fluix_glass_cable') - .inputFluids(Fluid.of('gtceu:silicone_rubber', 144/2)) + .inputFluids(Fluid.of('gtceu:silicone_rubber', 144 / 2)) .itemOutputs('ae2:fluix_covered_cable') .circuit(2) .duration(10) @@ -675,7 +683,7 @@ const registerAE2Recipes = (event) => { event.recipes.gtceu.assembler('fluix_covered_cable_styrene_butadiene_rubber') .itemInputs( '4x ae2:fluix_glass_cable') - .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144/4)) + .inputFluids(Fluid.of('gtceu:styrene_butadiene_rubber', 144 / 4)) .itemOutputs('4x ae2:fluix_covered_cable') .circuit(2) .duration(10) @@ -689,7 +697,7 @@ const registerAE2Recipes = (event) => { '#forge:fine_wires/borosilicate_glass', '#forge:small_dusts/fluix', '#forge:dusts/redstone') - .inputFluids(Fluid.of('gtceu:rubber', 144*4)) + .inputFluids(Fluid.of('gtceu:rubber', 144 * 4)) .itemOutputs('4x ae2:fluix_smart_cable') .circuit(2) .duration(10) @@ -702,7 +710,7 @@ const registerAE2Recipes = (event) => { '#forge:fine_wires/borosilicate_glass', '#forge:small_dusts/fluix', '#forge:dusts/redstone') - .inputFluids(Fluid.of('gtceu:silicone_rubber', 144*2)) + .inputFluids(Fluid.of('gtceu:silicone_rubber', 144 * 2)) .itemOutputs('4x ae2:fluix_smart_cable') .circuit(2) .duration(10) @@ -723,32 +731,32 @@ const registerAE2Recipes = (event) => { // Covered dense cable -global.MINECRAFT_DYE_NAMES.forEach(dye => { - event.recipes.gtceu.packer(`${dye}_covered_pack`) - .itemInputs(`4x ae2:${dye}_covered_cable`) - .itemOutputs(`ae2:${dye}_covered_dense_cable`) - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.gtceu.packer(`${dye}_covered_pack`) + .itemInputs(`4x ae2:${dye}_covered_cable`) + .itemOutputs(`ae2:${dye}_covered_dense_cable`) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.packer(`${dye}_covered_unpack`) - .itemInputs(`ae2:${dye}_covered_dense_cable`) - .itemOutputs(`4x ae2:${dye}_covered_cable`) - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.packer(`${dye}_covered_unpack`) + .itemInputs(`ae2:${dye}_covered_dense_cable`) + .itemOutputs(`4x ae2:${dye}_covered_cable`) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.packer(`${dye}_smart_pack`) - .itemInputs(`4x ae2:${dye}_smart_cable`) - .itemOutputs(`ae2:${dye}_smart_dense_cable`) - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.packer(`${dye}_smart_pack`) + .itemInputs(`4x ae2:${dye}_smart_cable`) + .itemOutputs(`ae2:${dye}_smart_dense_cable`) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) - event.recipes.gtceu.packer(`${dye}_smart_unpack`) - .itemInputs(`ae2:${dye}_smart_dense_cable`) - .itemOutputs(`4x ae2:${dye}_smart_cable`) - .duration(20) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.packer(`${dye}_smart_unpack`) + .itemInputs(`ae2:${dye}_smart_dense_cable`) + .itemOutputs(`4x ae2:${dye}_smart_cable`) + .duration(20) + .EUt(GTValues.VA[GTValues.LV]) - }) + }) event.recipes.gtceu.packer('pack_fluix_covered_dense_cable') .itemInputs('4x ae2:fluix_covered_cable') @@ -819,7 +827,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { // Pattern box - event.shaped('ae2:pattern_box', [ + event.recipes.gtceu.shaped('ae2:pattern_box', [ 'ABA', 'CAC' ], { @@ -853,6 +861,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .duration(20) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') + .addMaterialInfo(true) // Formation Core @@ -866,7 +875,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .circuit(5) .duration(20) .EUt(GTValues.VA[GTValues.MV]) - .cleanroom(CleanroomType.CLEANROOM) + .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.assembler('ae2:formation_core_moon') .itemInputs( @@ -879,6 +888,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .duration(20) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') + .addMaterialInfo(true) // Wireless Crafting Terminal event.recipes.gtceu.assembler('ae2:wireless_crafting_terminal') @@ -891,7 +901,8 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:crafting_terminal') .itemOutputs('ae2:wireless_crafting_terminal') .duration(300) - .EUt(GTValues.VA[GTValues.EV]) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) //#region Storage Components @@ -905,73 +916,73 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .inputFluids(Fluid.of('tfg:fluix', 288)) .itemOutputs('ae2:cell_component_1k') .duration(200) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.MV]) - // 4k storage components + // 4k storage components - event.recipes.gtceu.assembler('ae2:cell_component_4k_1k') - .itemInputs( - '2x #gtceu:circuits/ev', + event.recipes.gtceu.assembler('ae2:cell_component_4k_1k') + .itemInputs( + '2x #gtceu:circuits/ev', '8x gtceu:cpu_chip', '4x #forge:foils/polyethylene', '4x ae2:logic_processor', - '3x ae2:cell_component_1k') - .inputFluids(Fluid.of('tfg:fluix', 288)) - .itemOutputs('ae2:cell_component_4k') - .duration(400) + '3x ae2:cell_component_1k') + .inputFluids(Fluid.of('tfg:fluix', 288)) + .itemOutputs('ae2:cell_component_4k') + .duration(400) .circuit(2) - .EUt(GTValues.VA[GTValues.HV]) - .cleanroom(CleanroomType.CLEANROOM) + .EUt(GTValues.VA[GTValues.HV]) + .cleanroom(CleanroomType.CLEANROOM) - event.recipes.gtceu.assembler('ae2:cell_component_4k') - .itemInputs( - '2x #gtceu:circuits/hv', + event.recipes.gtceu.assembler('ae2:cell_component_4k') + .itemInputs( + '2x #gtceu:circuits/hv', '8x gtceu:cpu_chip', '4x #forge:foils/polyethylene', '4x ae2:logic_processor', - '2x ae2:cell_component_1k') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 288)) - .itemOutputs('ae2:cell_component_4k') - .duration(200) + '2x ae2:cell_component_1k') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 288)) + .itemOutputs('ae2:cell_component_4k') + .duration(200) .circuit(1) - .EUt(GTValues.VA[GTValues.MV]) - .dimension('ad_astra:moon') + .EUt(GTValues.VA[GTValues.MV]) + .dimension('ad_astra:moon') // 16k storage components event.recipes.gtceu.assembler('ae2:cell_component_16k_4k') .itemInputs( - '2x #gtceu:circuits/iv', + '2x #gtceu:circuits/iv', '16x gtceu:ram_chip', '16x #forge:foils/polyvinyl_chloride', '16x ae2:logic_processor', - '3x ae2:cell_component_4k') + '3x ae2:cell_component_4k') .inputFluids(Fluid.of('tfg:fluix', 576)) .itemOutputs('ae2:cell_component_16k') .duration(400) .circuit(2) - .EUt(GTValues.VA[GTValues.EV]) + .EUt(GTValues.VA[GTValues.EV]) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.assembler('ae2:cell_component_16k') .itemInputs( - '2x #gtceu:circuits/ev', + '2x #gtceu:circuits/ev', '16x gtceu:ram_chip', '16x #forge:foils/polyvinyl_chloride', '16x ae2:logic_processor', - '2x ae2:cell_component_4k') + '2x ae2:cell_component_4k') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 576)) .itemOutputs('ae2:cell_component_16k') .duration(200) .circuit(1) - .EUt(GTValues.VA[GTValues.HV]) + .EUt(GTValues.VA[GTValues.HV]) .dimension('ad_astra:moon') // 64k storage components event.recipes.gtceu.assembler('ae2:cell_component_64k_16k') .itemInputs( - '2x #gtceu:circuits/luv', + '2x #gtceu:circuits/luv', '8x gtceu:nano_cpu_chip', '64x #forge:foils/polyvinyl_chloride', '64x ae2:logic_processor', @@ -980,28 +991,28 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('ae2:cell_component_64k') .duration(400) .circuit(2) - .EUt(GTValues.VA[GTValues.IV]) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.assembler('ae2:cell_component_64k') .itemInputs( - '2x #gtceu:circuits/iv', + '2x #gtceu:circuits/iv', '8x gtceu:nano_cpu_chip', '64x #forge:foils/polyvinyl_chloride', '64x ae2:logic_processor', - '2x ae2:cell_component_16k') + '2x ae2:cell_component_16k') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 1152)) .itemOutputs('ae2:cell_component_64k') .duration(200) .circuit(1) - .EUt(GTValues.VA[GTValues.EV]) + .EUt(GTValues.VA[GTValues.EV]) .dimension('ad_astra:moon') // 256k storage components event.recipes.gtceu.assembler('ae2:cell_component_256k_64k') .itemInputs( - '2x #gtceu:circuits/zpm', + '2x #gtceu:circuits/zpm', '16x gtceu:qbit_cpu_chip', '64x #forge:foils/polyphenylene_sulfide', '64x #forge:foils/polyphenylene_sulfide', @@ -1012,23 +1023,23 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('ae2:cell_component_256k') .duration(400) .circuit(2) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.LuV]) .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.assembler('ae2:cell_component_256k') .itemInputs( - '2x #gtceu:circuits/luv', + '2x #gtceu:circuits/luv', '16x gtceu:qbit_cpu_chip', '64x #forge:foils/polyphenylene_sulfide', '64x #forge:foils/polyphenylene_sulfide', '64x ae2:logic_processor', '64x ae2:logic_processor', - '2x ae2:cell_component_64k') + '2x ae2:cell_component_64k') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 2304)) .itemOutputs('ae2:cell_component_256k') .duration(200) .circuit(1) - .EUt(GTValues.VA[GTValues.IV]) + .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') //#endregion @@ -1106,6 +1117,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('ae2:storage_monitor') .duration(200) .EUt(480) + .addMaterialInfo(true) // Conversion Monitor event.recipes.gtceu.assembler('ae2:conversion_monitor') @@ -1117,6 +1129,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('ae2:conversion_monitor') .duration(200) .EUt(480) + .addMaterialInfo(true) // Level Emitter event.recipes.gtceu.assembler('ae2:level_emitter') @@ -1130,6 +1143,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .duration(20) .EUt(480) .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true) // Storage Bus event.recipes.gtceu.assembler('ae2:storage_bus') @@ -1142,6 +1156,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .circuit(1) .duration(200) .EUt(480) + .addMaterialInfo(true) // Import Bus event.recipes.gtceu.assembler('ae2:import_bus') @@ -1155,6 +1170,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .circuit(2) .duration(200) .EUt(480) + .addMaterialInfo(true) // Export Bus event.recipes.gtceu.assembler('ae2:export_bus') @@ -1168,6 +1184,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .circuit(3) .duration(200) .EUt(480) + .addMaterialInfo(true) // CPU Crafting Unit event.recipes.gtceu.assembler('ae2:crafting_unit') @@ -1177,7 +1194,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:calculation_processor', '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') - .inputFluids(Fluid.of('tfg:fluix', 144*5)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 5)) .itemOutputs('ae2:crafting_unit') .duration(200) .EUt(GTValues.VA[GTValues.HV]) @@ -1190,11 +1207,12 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { 'ae2:calculation_processor', '#gtceu:circuits/ev', '6x #forge:plates/stainless_steel') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*5)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 5)) .itemOutputs('2x ae2:crafting_unit') .duration(200) .EUt(GTValues.VA[GTValues.HV]) .dimension('ad_astra:moon') + .addMaterialInfo(true) //#region Molecular Assembler @@ -1210,7 +1228,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .EUt(GTValues.VA[GTValues.HV]) .cleanroom(CleanroomType.CLEANROOM) // EV Moon @@ -1225,7 +1243,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.EV]) + .EUt(GTValues.VA[GTValues.EV]) .dimension('ad_astra:moon') // IV @@ -1237,40 +1255,41 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '8x ae2:formation_core', '2x gtceu:iv_robot_arm', '6x #forge:plates/tungsten_steel') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) .itemOutputs('8x ae2:molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.IV]) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) //#endregion // ME Контроллер event.recipes.gtceu.assembler('ae2:controller') - .itemInputs( - '16x ae2:engineering_processor', - '2x #gtceu:circuits/hv', - '2x #forge:plates/titanium', - 'ae2:fluix_block') - .inputFluids(Fluid.of('gtceu:polyethylene', 144)) - .itemOutputs('ae2:controller') - .duration(200) - .EUt(480) - .cleanroom(CleanroomType.CLEANROOM) + .itemInputs( + '16x ae2:engineering_processor', + '2x #gtceu:circuits/hv', + '2x #forge:plates/titanium', + 'ae2:fluix_block') + .inputFluids(Fluid.of('gtceu:polyethylene', 144)) + .itemOutputs('ae2:controller') + .duration(200) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true, true) - event.recipes.gtceu.assembler('ae2:controller_shulker') - .itemInputs( - '16x ae2:engineering_processor', - '2x #gtceu:circuits/hv', - '2x minecraft:shulker_shell', - 'ae2:fluix_block') - .inputFluids(Fluid.of('gtceu:polyethylene', 144)) - .itemOutputs('ae2:controller') - .duration(200) - .EUt(480) - .cleanroom(CleanroomType.CLEANROOM) - - //#region ME Interfaces + event.recipes.gtceu.assembler('ae2:controller_shulker') + .itemInputs( + '16x ae2:engineering_processor', + '2x #gtceu:circuits/hv', + '2x minecraft:shulker_shell', + 'ae2:fluix_block') + .inputFluids(Fluid.of('gtceu:polyethylene', 144)) + .itemOutputs('ae2:controller') + .duration(200) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + + //#region ME Interfaces // MV event.recipes.gtceu.assembler('ae2:interface_mv') @@ -1282,7 +1301,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:interface') - .duration(20*20) + .duration(20 * 20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1296,7 +1315,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:interface') - .duration(20*10) + .duration(20 * 10) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') @@ -1308,9 +1327,9 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) .itemOutputs('16x ae2:interface') - .duration(20*20) + .duration(20 * 20) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1322,9 +1341,9 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) .itemOutputs('32x ae2:interface') - .duration(20*10) + .duration(20 * 10) .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') @@ -1343,7 +1362,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:pattern_provider') - .duration(20*20) + .duration(20 * 20) .EUt(GTValues.VA[GTValues.MV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1357,7 +1376,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x ae2:formation_core') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('4x ae2:pattern_provider') - .duration(20*10) + .duration(20 * 10) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') @@ -1369,9 +1388,9 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) .itemOutputs('16x ae2:pattern_provider') - .duration(20*20) + .duration(20 * 20) .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1383,9 +1402,9 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #forge:plates/tungsten_steel', '16x ae2:annihilation_core', '16x ae2:formation_core') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) .itemOutputs('32x ae2:pattern_provider') - .duration(20*10) + .duration(20 * 10) .EUt(GTValues.VA[GTValues.IV]) .dimension('ad_astra:moon') @@ -1400,7 +1419,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_1k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_1k') @@ -1412,7 +1431,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_4k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_4k') @@ -1425,7 +1444,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_16k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_16k') @@ -1438,7 +1457,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_64k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_64k') @@ -1451,7 +1470,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_256k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:item_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_item_cell_256k') @@ -1468,7 +1487,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_1k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_1k') @@ -1480,7 +1499,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_4k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_4k') @@ -1493,7 +1512,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_16k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_16k') @@ -1506,7 +1525,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_64k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_64k') @@ -1519,7 +1538,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( 'ae2:chest', 'ae2:cell_component_256k', - 'gtceu:mv_sodium_battery', + '#gtceu:batteries/mv', 'ae2:fluid_cell_housing') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:portable_fluid_cell_256k') @@ -1544,9 +1563,9 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('2x ae2:logic_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) - .cleanroom(CleanroomType.CLEANROOM) + .cleanroom(CleanroomType.CLEANROOM) event.recipes.gtceu.circuit_assembler('ae2:logic_processor') .itemInputs( @@ -1556,7 +1575,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('3x ae2:logic_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) .dimension('ad_astra:moon') @@ -1571,7 +1590,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('2x ae2:calculation_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1583,7 +1602,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('3x ae2:calculation_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) .dimension('ad_astra:moon') @@ -1598,7 +1617,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('2x ae2:engineering_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) .cleanroom(CleanroomType.CLEANROOM) @@ -1610,7 +1629,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '1x minecraft:redstone') .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144)) .itemOutputs('3x ae2:engineering_processor') - .duration(20*5) + .duration(20 * 5) .EUt(GTValues.VA[GTValues.HV]) .dimension('ad_astra:moon') @@ -1694,6 +1713,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .duration(8) .EUt(480) .category(GTRecipeCategories.CHEM_DYES) + .addMaterialInfo(true) // Covered Cable event.recipes.gtceu.chemical_bath('ae2:fluix_covered_cable') @@ -1729,7 +1749,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { // Cable Colorization for (let i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(`${global.AE2_GLASS_CABLES[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_GLASS_CABLES[i]}_dye`) .itemInputs('ae2:fluix_glass_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_GLASS_CABLES[i]) @@ -1737,7 +1757,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_CABLES[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_CABLES[i]}_dye`) .itemInputs('ae2:fluix_covered_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_COVERED_CABLES[i]) @@ -1745,7 +1765,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_DENSE_CABLES[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_DENSE_CABLES[i]}_dye`) .itemInputs('ae2:fluix_covered_dense_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) @@ -1753,7 +1773,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_CABLES[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_CABLES[i]}_dye`) .itemInputs('ae2:fluix_smart_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_SMART_CABLES[i]) @@ -1761,7 +1781,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_DENSE_CABLES[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_DENSE_CABLES[i]}_dye`) .itemInputs('ae2:fluix_smart_dense_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) @@ -1770,7 +1790,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .category(GTRecipeCategories.CHEM_DYES) // Paint Balls - event.recipes.gtceu.chemical_bath(`${global.AE2_PAINTBALLS[i] }_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_PAINTBALLS[i]}_dye`) .itemInputs('ae2:matter_ball') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 36)) .itemOutputs(global.AE2_PAINTBALLS[i]) @@ -1779,7 +1799,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .category(GTRecipeCategories.CHEM_DYES) // Lumen Paint Ball - event.recipes.gtceu.chemical_bath(`${global.AE2_LUMEN_PAINTBALLS[i] }_gtceu_dye`) + event.recipes.gtceu.chemical_bath(`${global.AE2_LUMEN_PAINTBALLS[i]}_gtceu_dye`) .itemInputs(global.AE2_PAINTBALLS[i]) .inputFluids(Fluid.of('gtceu:glowstone', 125)) .itemOutputs(global.AE2_LUMEN_PAINTBALLS[i]) @@ -1788,37 +1808,37 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .category(GTRecipeCategories.CHEM_DYES) }; - // Inscriber Silicon Press - event.recipes.gtceu.forming_press('ae2:silicon_press_stainless_steel') - .itemInputs('#forge:plates/stainless_steel') - .notConsumable('ae2:silicon_press') - .itemOutputs('ae2:silicon_press') - .duration(100) - .EUt(480) + // Inscriber Silicon Press + event.recipes.gtceu.forming_press('ae2:silicon_press_stainless_steel') + .itemInputs('#forge:plates/stainless_steel') + .notConsumable('ae2:silicon_press') + .itemOutputs('ae2:silicon_press') + .duration(100) + .EUt(480) - // Inscriber logic Press - event.recipes.gtceu.forming_press('ae2:logic_processor_press_stainless_steel') - .itemInputs('#forge:plates/stainless_steel') - .notConsumable('ae2:logic_processor_press') - .itemOutputs('ae2:logic_processor_press') - .duration(100) - .EUt(480) + // Inscriber logic Press + event.recipes.gtceu.forming_press('ae2:logic_processor_press_stainless_steel') + .itemInputs('#forge:plates/stainless_steel') + .notConsumable('ae2:logic_processor_press') + .itemOutputs('ae2:logic_processor_press') + .duration(100) + .EUt(480) - // Inscriber engineering Press - event.recipes.gtceu.forming_press('ae2:engineering_press_stainless_steel') - .itemInputs('#forge:plates/stainless_steel') - .notConsumable('ae2:engineering_processor_press') - .itemOutputs('ae2:engineering_processor_press') - .duration(100) - .EUt(480) + // Inscriber engineering Press + event.recipes.gtceu.forming_press('ae2:engineering_press_stainless_steel') + .itemInputs('#forge:plates/stainless_steel') + .notConsumable('ae2:engineering_processor_press') + .itemOutputs('ae2:engineering_processor_press') + .duration(100) + .EUt(480) - // Inscriber calculation Press - event.recipes.gtceu.forming_press('ae2:calculation_press_stainless_steel') - .itemInputs('#forge:plates/stainless_steel') - .notConsumable('ae2:calculation_processor_press') - .itemOutputs('ae2:calculation_processor_press') - .duration(100) - .EUt(480) + // Inscriber calculation Press + event.recipes.gtceu.forming_press('ae2:calculation_press_stainless_steel') + .itemInputs('#forge:plates/stainless_steel') + .notConsumable('ae2:calculation_processor_press') + .itemOutputs('ae2:calculation_processor_press') + .duration(100) + .EUt(480) // Quartz Fiber event.recipes.gtceu.wiremill('ae2:quartz_fiber_certus') @@ -1839,6 +1859,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('4x ae2:quartz_glass') .duration(20) .EUt(120) + .addMaterialInfo(true) // Vibrant Quartz Glass event.recipes.gtceu.alloy_smelter('ae2:quartz_vibrant_glass') @@ -1846,6 +1867,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemOutputs('ae2:quartz_vibrant_glass') .duration(20) .EUt(480) + .addMaterialInfo(true) // Charged Certus Quartz 1x event.recipes.gtceu.polarizer('ae2:charged_certus_quartz_crystal_1x') @@ -2173,8 +2195,8 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '8x ae2:engineering_processor', '14x gtceu:iv_sensor', 'ae2:logic_processor') - .inputFluids(Fluid.of('tfg:fluix', 144*200)) - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*150)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 200)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 150)) .itemOutputs('ae2:quantum_ring') .duration(900) .EUt(GTValues.VA[GTValues.ZPM]) @@ -2198,8 +2220,8 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '32x gtceu:uv_emitter', '8x gtceu:uv_field_generator', 'gtceu:max_battery') - .inputFluids(Fluid.of('tfg:fluix', 144*2000)) - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*1500)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 2000)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 1500)) .stationResearch(b => b.researchStack(Item.of('ae2:quartz_glass')).EUt(GTValues.VA[GTValues.UV]).CWUt(256)) .dimension('ad_astra:moon') .itemOutputs('ae2:quantum_link') @@ -2214,6 +2236,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .duration(200) .EUt(480) .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true, true) // Fluix crystal event.recipes.gtceu.mixer('ae2:fluix_crystal') @@ -2278,12 +2301,12 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .inputFluids(Fluid.of('gtceu:helium_3', 1000)) .inputFluids(Fluid.of('tfg:fluix', 144)) .outputFluids(Fluid.of('tfg:cryogenized_fluix', 576)) - .duration(30*20) + .duration(30 * 20) .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') // Certus deco blocks - + event.stonecutting('ae2:quartz_block', '#tfg:certus_quartz_blocks') event.stonecutting('ae2:cut_quartz_block', '#tfg:certus_quartz_blocks') event.stonecutting('ae2:smooth_quartz_block', '#tfg:certus_quartz_blocks') @@ -2325,7 +2348,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { // other deco - event.shaped('ae2:not_so_mysterious_cube', [ + event.recipes.gtceu.shaped('ae2:not_so_mysterious_cube', [ ' A ', 'BCD', ' E ' diff --git a/kubejs/server_scripts/ae2iec/recipes.js b/kubejs/server_scripts/ae2iec/recipes.js index bb89cba71..eac1811a7 100644 --- a/kubejs/server_scripts/ae2iec/recipes.js +++ b/kubejs/server_scripts/ae2iec/recipes.js @@ -18,6 +18,7 @@ const registerAE2InsertExportCardRecipes = (event) => { .itemOutputs('ae2insertexportcard:insert_card') .duration(100) .EUt(1920) + .addMaterialInfo(true) // Export Card event.recipes.gtceu.assembler('ae2insertexportcard:export_card') @@ -30,4 +31,5 @@ const registerAE2InsertExportCardRecipes = (event) => { .itemOutputs('ae2insertexportcard:export_card') .duration(100) .EUt(1920) + .addMaterialInfo(true) } \ No newline at end of file diff --git a/kubejs/server_scripts/ae2na/recipes.js b/kubejs/server_scripts/ae2na/recipes.js index 99434bf2f..0c94dd592 100644 --- a/kubejs/server_scripts/ae2na/recipes.js +++ b/kubejs/server_scripts/ae2na/recipes.js @@ -4,7 +4,7 @@ const registerAE2NetworkAnalyzerRecipes = (event) => { // Network_analyser - event.shaped('ae2netanalyser:network_analyser', [ + event.recipes.gtceu.shaped('ae2netanalyser:network_analyser', [ 'ABA', 'CDC', 'EFE' @@ -15,5 +15,5 @@ const registerAE2NetworkAnalyzerRecipes = (event) => { D: 'gtceu:computer_monitor_cover', E: '#forge:plates/stainless_steel', F: '#gtceu:batteries/hv' - }).id('ae2netanalyser:analyser') + }).addMaterialInfo().id('ae2netanalyser:analyser') } diff --git a/kubejs/server_scripts/ae2wtlib/recipes.js b/kubejs/server_scripts/ae2wtlib/recipes.js index 9eb5c5b57..024a80e96 100644 --- a/kubejs/server_scripts/ae2wtlib/recipes.js +++ b/kubejs/server_scripts/ae2wtlib/recipes.js @@ -23,6 +23,7 @@ const registerAE2WTLibRecipes = (event) => { .itemOutputs('ae2wtlib:wireless_pattern_encoding_terminal') .duration(300) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) // Pattern Access Terminal event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_access_terminal') @@ -36,6 +37,7 @@ const registerAE2WTLibRecipes = (event) => { .itemOutputs('ae2wtlib:wireless_pattern_access_terminal') .duration(300) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) // Magnet Card event.recipes.gtceu.assembler('ae2wtlib:magnet_card') @@ -47,6 +49,7 @@ const registerAE2WTLibRecipes = (event) => { .itemOutputs('ae2wtlib:magnet_card') .duration(300) .EUt(250) + .addMaterialInfo(true) // Quantum Bridge Card event.recipes.gtceu.assembly_line('ae2wtlib:quantum_bridge_card') @@ -82,4 +85,5 @@ const registerAE2WTLibRecipes = (event) => { .itemOutputs(Item.of('ae2wtlib:wireless_universal_terminal')) .duration(300) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) } \ No newline at end of file diff --git a/kubejs/server_scripts/alekiships/recipes.js b/kubejs/server_scripts/alekiships/recipes.js index 4fa050903..1b6233bdd 100644 --- a/kubejs/server_scripts/alekiships/recipes.js +++ b/kubejs/server_scripts/alekiships/recipes.js @@ -19,6 +19,7 @@ const registerAlekishipsRecipes = (event) => { .itemOutputs('alekiships:oarlock') .duration(75) .EUt(4) + .addMaterialInfo(true) event.recipes.tfc.heating('alekiships:oarlock', 1535) .resultFluid(Fluid.of('gtceu:iron', 288)) @@ -32,6 +33,7 @@ const registerAlekishipsRecipes = (event) => { .itemOutputs('alekiships:cleat') .duration(75) .EUt(4) + .addMaterialInfo(true) event.recipes.tfc.heating('alekiships:cleat', 1535) .resultFluid(Fluid.of('gtceu:steel', 288)) @@ -45,6 +47,7 @@ const registerAlekishipsRecipes = (event) => { .itemOutputs('alekiships:anchor') .duration(75) .EUt(4) + .addMaterialInfo(true) event.recipes.tfc.heating('alekiships:anchor', 1535) .resultFluid(Fluid.of('gtceu:steel', 288)) @@ -66,6 +69,7 @@ const registerAlekishipsRecipes = (event) => { .duration(75) .category(GTRecipeCategories.INGOT_MOLDING) .EUt(4) + .addMaterialInfo(true) event.recipes.tfc.heating('alekiships:cannonball', 1535) .resultFluid(Fluid.of('gtceu:iron', 288)) diff --git a/kubejs/server_scripts/buildinggadgets2/recipes.js b/kubejs/server_scripts/buildinggadgets2/recipes.js index f50dbe3e1..391c1031e 100644 --- a/kubejs/server_scripts/buildinggadgets2/recipes.js +++ b/kubejs/server_scripts/buildinggadgets2/recipes.js @@ -16,20 +16,7 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:gadget_building') .duration(160) .EUt(2000) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/gadget_building') - .itemInputs('1x buildinggadgets2:gadget_building') - .itemOutputs('10x gtceu:titanium_ingot', '1x gtceu:lapotron_gem') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/gadget_building') - .itemInputs('1x buildinggadgets2:gadget_building') - .itemOutputs('10x gtceu:titanium_dust', '15x gtceu:lapotron_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) // Exchanging Gadget event.recipes.gtceu.assembler('buildinggadgets2:/assembler/gadget_exchanging') @@ -38,20 +25,7 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:gadget_exchanging') .duration(160) .EUt(2000) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/gadget_exchanging') - .itemInputs('1x buildinggadgets2:gadget_exchanging') - .itemOutputs('10x gtceu:titanium_ingot', '1x gtceu:lapotron_gem') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/gadget_exchanging') - .itemInputs('1x buildinggadgets2:gadget_exchanging') - .itemOutputs('10x gtceu:titanium_dust', '15x gtceu:lapotron_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) // Copy Paste Gadget event.recipes.gtceu.assembler('buildinggadgets2:/assembler/gadget_copy_paste') @@ -60,20 +34,7 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:gadget_copy_paste') .duration(160) .EUt(8100) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/gadget_copy_paste') - .itemInputs('1x buildinggadgets2:gadget_copy_paste') - .itemOutputs('10x gtceu:tungsten_steel_ingot', '1x gtceu:lapotron_gem') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/gadget_copy_paste') - .itemInputs('1x buildinggadgets2:gadget_copy_paste') - .itemOutputs('10x gtceu:tungsten_steel_dust', '15x gtceu:lapotron_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) // Dustruction Gadget event.recipes.gtceu.assembler('buildinggadgets2:/assembler/gadget_destruction') @@ -82,20 +43,7 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:gadget_destruction') .duration(160) .EUt(2000) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/gadget_destruction') - .itemInputs('1x buildinggadgets2:gadget_destruction') - .itemOutputs('10x gtceu:titanium_ingot', '1x gtceu:energy_crystal') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/gadget_destruction') - .itemInputs('1x buildinggadgets2:gadget_destruction') - .itemOutputs('10x gtceu:titanium_dust', '9x gtceu:energium_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) // Cut Paste Gadget event.recipes.gtceu.assembler('buildinggadgets2:/assembler/gadget_cut_paste') @@ -104,20 +52,7 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:gadget_cut_paste') .duration(160) .EUt(8100) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/gadget_cut_paste') - .itemInputs('1x buildinggadgets2:gadget_cut_paste') - .itemOutputs('10x gtceu:tungsten_steel_ingot', '1x gtceu:energy_crystal') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/gadget_cut_paste') - .itemInputs('1x buildinggadgets2:gadget_cut_paste') - .itemOutputs('10x gtceu:tungsten_steel_dust', '9x gtceu:energium_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) // Template Manager event.recipes.gtceu.assembler('buildinggadgets2:/assembler/template_manager') @@ -126,18 +61,5 @@ const registerBuildingGadgetsRecipes = (event) => { .itemOutputs('buildinggadgets2:template_manager ') .duration(160) .EUt(2000) - - event.recipes.gtceu.arc_furnace('buildinggadgets2:arc_furnace/recycling/template_manager') - .itemInputs('1x buildinggadgets2:template_manager') - .itemOutputs('10x gtceu:tungsten_steel_ingot') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('buildinggadgets2:macerator/recycling/template_manager') - .itemInputs('1x buildinggadgets2:template_manager') - .itemOutputs('10x gtceu:tungsten_steel_dust') - .duration(224) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + .addMaterialInfo(true) } diff --git a/kubejs/server_scripts/cccbridge/recipes.js b/kubejs/server_scripts/cccbridge/recipes.js index 075929554..48cee03e9 100644 --- a/kubejs/server_scripts/cccbridge/recipes.js +++ b/kubejs/server_scripts/cccbridge/recipes.js @@ -3,8 +3,6 @@ const registerCccBridgeRecipes = (event) => { - registerCccBridgeRecyclingRecipes(event); - event.remove({not: [ { id: 'cccbridge:to_target_block' }, { id: 'cccbridge:to_source_block' } @@ -17,6 +15,7 @@ const registerCccBridgeRecipes = (event) => { .itemOutputs('cccbridge:animatronic_block') .duration(800) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) // Scroller Pane event.recipes.gtceu.assembler('cccbridge:assembler/scroller_block') @@ -25,6 +24,7 @@ const registerCccBridgeRecipes = (event) => { .itemOutputs('cccbridge:scroller_block') .duration(600) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) // RedRouter Block event.recipes.gtceu.assembler('cccbridge:assembler/redrouter_block') @@ -33,6 +33,7 @@ const registerCccBridgeRecipes = (event) => { .itemOutputs('cccbridge:redrouter_block') .duration(800) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) // Source Block event.recipes.gtceu.assembler('cccbridge:assembler/source_block') @@ -41,4 +42,5 @@ const registerCccBridgeRecipes = (event) => { .itemOutputs('cccbridge:source_block') .duration(800) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) } \ No newline at end of file diff --git a/kubejs/server_scripts/cccbridge/recipes.recycling.js b/kubejs/server_scripts/cccbridge/recipes.recycling.js deleted file mode 100644 index 95f25a6b0..000000000 --- a/kubejs/server_scripts/cccbridge/recipes.recycling.js +++ /dev/null @@ -1,95 +0,0 @@ -// priority: 0 -"use strict"; - -function registerCccBridgeRecyclingRecipes(event) { - - // Source Block - event.recipes.gtceu.macerator('cccbridge:macerator/recycling/source_block') - .itemInputs('cccbridge:source_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Redstone, 4) - ) - .duration(GTMaterials.Aluminium.getMass() * 5) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('cccbridge:arc_furnace/recycling/source_block') - .itemInputs('cccbridge:source_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 5), - ChemicalHelper.get(TagPrefix.plate, GTMaterials.Redstone, 4) - ) - .duration(GTMaterials.Aluminium.getMass() * 5) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Target Block - event.recipes.gtceu.macerator('cccbridge:macerator/recycling/target_block') - .itemInputs('cccbridge:target_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Redstone, 4) - ) - .duration(GTMaterials.Aluminium.getMass() * 5) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('cccbridge:arc_furnace/recycling/target_block') - .itemInputs('cccbridge:target_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 5), - ChemicalHelper.get(TagPrefix.plate, GTMaterials.Redstone, 4) - ) - .duration(GTMaterials.Aluminium.getMass() * 5) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // RedRouter Block - event.recipes.gtceu.macerator('cccbridge:macerator/recycling/redrouter_block') - .itemInputs('cccbridge:redrouter_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedAlloy, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Brass, 5) - ) - .duration(GTMaterials.Aluminium.getMass() * 4) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('cccbridge:arc_furnace/recycling/redrouter_block') - .itemInputs('cccbridge:redrouter_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedAlloy, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Brass, 5) - ) - .duration(GTMaterials.Aluminium.getMass() * 4) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Animatronic Block - event.recipes.gtceu.macerator('cccbridge:macerator/recycling/animatronic_block') - .itemInputs('cccbridge:animatronic_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 18), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 12), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Gold, 5) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 18) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('cccbridge:arc_furnace/recycling/animatronic_block') - .itemInputs('cccbridge:animatronic_block') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 18), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 12), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Gold, 5) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 18) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) -} \ No newline at end of file diff --git a/kubejs/server_scripts/computer_craft/recipes.js b/kubejs/server_scripts/computer_craft/recipes.js index cd986465c..533eb92a2 100644 --- a/kubejs/server_scripts/computer_craft/recipes.js +++ b/kubejs/server_scripts/computer_craft/recipes.js @@ -3,8 +3,6 @@ const registerComputerCraftRecipes = (event) => { - registerComputerCraftRecyclingRecipes(event); - // Удаление рецептов мода event.remove({ not: [ @@ -20,9 +18,10 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:cable') .duration(80) .EUt(120) + .addMaterialInfo(true) // Wireless Modem Normal - event.shaped('computercraft:wireless_modem_normal', [ + event.recipes.gtceu.shaped('computercraft:wireless_modem_normal', [ ' A ', 'BCB', ' D ' @@ -31,10 +30,10 @@ const registerComputerCraftRecipes = (event) => { B: 'ae2:calculation_processor', C: '#gtceu:circuits/hv', D: 'computercraft:cable', - }).id('tfg:crafting/wireless_modem_normal') + }).addMaterialInfo().id('tfg:crafting/wireless_modem_normal') // Wireless Modem Advanced - event.shaped('computercraft:wireless_modem_advanced', [ + event.recipes.gtceu.shaped('computercraft:wireless_modem_advanced', [ ' A ', 'BCB', ' D ' @@ -43,10 +42,10 @@ const registerComputerCraftRecipes = (event) => { B: 'ae2:calculation_processor', C: '#gtceu:circuits/hv', D: 'computercraft:cable', - }).id('tfg:crafting/wireless_modem_advanced') + }).addMaterialInfo().id('tfg:crafting/wireless_modem_advanced') // Monitor Normal - event.shaped('computercraft:monitor_normal', [ + event.recipes.gtceu.shaped('computercraft:monitor_normal', [ 'ABA', 'CDC', 'EFE' @@ -57,10 +56,10 @@ const registerComputerCraftRecipes = (event) => { D: 'gtceu:mv_machine_casing', E: 'computercraft:cable', F: '#gtceu:circuits/mv', - }).id('tfg:crafting/monitor_normal') + }).addMaterialInfo().id('tfg:crafting/monitor_normal') // Monitor Advanced - event.shaped('computercraft:monitor_advanced', [ + event.recipes.gtceu.shaped('computercraft:monitor_advanced', [ 'ABA', 'CDC', 'EFE' @@ -71,10 +70,10 @@ const registerComputerCraftRecipes = (event) => { D: 'gtceu:hv_machine_casing', E: 'computercraft:cable', F: '#gtceu:circuits/hv', - }).id('tfg:crafting/monitor_advanced') + }).addMaterialInfo().id('tfg:crafting/monitor_advanced') // Disk Drive - event.shaped('computercraft:disk_drive', [ + event.recipes.gtceu.shaped('computercraft:disk_drive', [ 'ABA', 'CDC', 'AEA' @@ -84,10 +83,10 @@ const registerComputerCraftRecipes = (event) => { C: '#gtceu:circuits/mv', D: 'gtceu:mv_machine_casing', E: 'gtceu:mv_sensor', - }).id('tfg:crafting/disk_drive') + }).addMaterialInfo().id('tfg:crafting/disk_drive') // Speaker - event.shaped('computercraft:speaker', [ + event.recipes.gtceu.shaped('computercraft:speaker', [ ' A ', 'BCB', ' D ' @@ -96,10 +95,10 @@ const registerComputerCraftRecipes = (event) => { B: 'computercraft:cable', C: 'gtceu:mv_machine_casing', D: '#gtceu:circuits/mv', - }).id('tfg:crafting/speaker') + }).addMaterialInfo().id('tfg:crafting/speaker') // Printer - event.shaped('computercraft:printer', [ + event.recipes.gtceu.shaped('computercraft:printer', [ 'ABC', 'DED', 'FBF' @@ -110,10 +109,10 @@ const registerComputerCraftRecipes = (event) => { D: 'computercraft:cable', E: 'gtceu:hv_machine_casing', F: 'gtceu:mv_conveyor_module' - }).id('tfg:crafting/printer') + }).addMaterialInfo().id('tfg:crafting/printer') // Wired Modem - event.shaped('computercraft:wired_modem', [ + event.recipes.gtceu.shaped('computercraft:wired_modem', [ ' A ', 'BCB', 'BDB' @@ -122,7 +121,7 @@ const registerComputerCraftRecipes = (event) => { B: 'computercraft:cable', C: '#gtceu:circuits/mv', D: 'ae2:calculation_processor', - }).id('tfg:crafting/wired_modem') + }).addMaterialInfo().id('tfg:crafting/wired_modem') event.shapeless('computercraft:wired_modem', ['computercraft:wired_modem_full']) .id('tfg:crafting/wired_modem_shapeless') @@ -137,6 +136,7 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:computer_normal') .duration(1200) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) // Computer Advanced event.recipes.gtceu.assembler('computercraft:assembler/computer_advanced') @@ -145,6 +145,7 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:computer_advanced') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) // Turtle Normal event.recipes.gtceu.assembler('computercraft:assembler/turtle_normal') @@ -153,6 +154,7 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:turtle_normal') .duration(1200) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) // Turtle Advanced event.recipes.gtceu.assembler('computercraft:assembler/turtle_advanced') @@ -161,6 +163,7 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:turtle_advanced') .duration(1200) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) // Disk Crafts for (let i = 0; i < 16; i++) { @@ -175,7 +178,7 @@ const registerComputerCraftRecipes = (event) => { // Normal Pocket Computers // Pocket Computer Normal - event.shaped('computercraft:pocket_computer_normal', [ + event.recipes.gtceu.shaped('computercraft:pocket_computer_normal', [ 'ABA', 'CDE', 'FGF' @@ -187,7 +190,7 @@ const registerComputerCraftRecipes = (event) => { E: 'gtceu:hv_emitter', F: '#gtceu:circuits/ev', G: '#forge:plates/titanium' - }).id('tfg:crafting/pocket_computer_normal') + }).addMaterialInfo().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"}'), [ @@ -209,7 +212,7 @@ const registerComputerCraftRecipes = (event) => { // Advanced Pocket Computers // Pocket Computer Advanced - event.shaped('computercraft:pocket_computer_advanced', [ + event.recipes.gtceu.shaped('computercraft:pocket_computer_advanced', [ 'ABA', 'CDE', 'FGF' @@ -221,7 +224,7 @@ const registerComputerCraftRecipes = (event) => { E: 'gtceu:ev_emitter', F: '#gtceu:circuits/iv', G: '#forge:plates/tungsten_steel' - }).id('tfg:crafting/pocket_computer_advanced') + }).addMaterialInfo().id('tfg:crafting/pocket_computer_advanced') // Pocket Computer Advanced Upgrade : Wireless Modem Advanced event.shapeless(Item.of('computercraft:pocket_computer_advanced', '{Upgrade:"computercraft:wireless_modem_advanced"}'), [ @@ -248,4 +251,5 @@ const registerComputerCraftRecipes = (event) => { .itemOutputs('computercraft:redstone_relay') .duration(1200) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) } \ 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 deleted file mode 100644 index 9ca5e3105..000000000 --- a/kubejs/server_scripts/computer_craft/recipes.recycling.js +++ /dev/null @@ -1,259 +0,0 @@ -// priority: 0 -"use strict"; - -function registerComputerCraftRecyclingRecipes(event) { - - // Computer - event.recipes.gtceu.macerator('computercraft:macerator/recycling/computer_normal') - .itemInputs('computercraft:computer_normal') - .itemOutputs( - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/computer_normal') - .itemInputs('computercraft:computer_normal') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 5), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.MagnesiumDiboride, 1) - ) - .duration(GTMaterials.Aluminium.getMass() * 5) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Advanced Computer - event.recipes.gtceu.macerator('computercraft:macerator/recycling/computer_advanced') - .itemInputs('computercraft:computer_advanced') - .itemOutputs( - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/computer_advanced') - .itemInputs('computercraft:computer_advanced') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.MercuryBariumCalciumCuprate, 1) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 4) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Turtle - event.recipes.gtceu.macerator('computercraft:macerator/recycling/turtle_normal') - .itemInputs('computercraft:turtle_normal') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 20), - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/turtle_normal') - .itemInputs('computercraft:turtle_normal') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 20), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 12), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 20) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Advanced Turtle - event.recipes.gtceu.macerator('computercraft:macerator/recycling/turtle_advanced') - .itemInputs('computercraft:turtle_advanced') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 20), - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/turtle_advanced') - .itemInputs('computercraft:turtle_advanced') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 20), - 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]) - - // Pocket Computer - event.recipes.gtceu.macerator('computercraft:macerator/recycling/pocket_computer_normal') - .itemInputs('computercraft:pocket_computer_normal') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 9), - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/pocket_computer_normal') - .itemInputs('computercraft:pocket_computer_normal') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 9), - 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]) - - // Advanced Pocket Computer - event.recipes.gtceu.macerator('computercraft:macerator/recycling/pocket_computer_advanced') - .itemInputs('computercraft:pocket_computer_advanced') - .itemOutputs( - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/pocket_computer_advanced') - .itemInputs('computercraft:pocket_computer_advanced') - .itemOutputs( - 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]) - - // Monitor - event.recipes.gtceu.macerator('computercraft:macerator/recycling/monitor_normal') - .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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/monitor_normal') - .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]) - - // Advanced Monitor - event.recipes.gtceu.macerator('computercraft:macerator/recycling/monitor_advanced') - .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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/monitor_advanced') - .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]) - - // Printer - event.recipes.gtceu.macerator('computercraft:macerator/recycling/printer') - .itemInputs('computercraft:printer') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 15), - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/printer') - .itemInputs('computercraft:printer') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 15), - 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]) - - // Disk Drive - event.recipes.gtceu.macerator('computercraft:macerator/recycling/disk_drive') - .itemInputs('computercraft:disk_drive') - .itemOutputs( - 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]) - - event.recipes.gtceu.arc_furnace('computercraft:arc_furnace/recycling/disk_drive') - .itemInputs('computercraft:disk_drive') - .itemOutputs( - 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/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 32fd63632..da36d3661 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -83,7 +83,7 @@ const registerCreateRecipes = (event) => { ]).id('create:crafting/kinetics/speedometer') // Пушка для постройки схематик - event.shaped('create:schematicannon', [ + event.recipes.gtceu.shaped('create:schematicannon', [ 'DE ', 'CAC' ], { @@ -91,7 +91,7 @@ const registerCreateRecipes = (event) => { C: '#tfc:rock/smooth', D: 'minecraft:dispenser', E: 'firmaciv:cannon' - }).id('tfg:create/shaped/schematicannon') + }).addMaterialInfo().id('tfg:create/shaped/schematicannon') // Стол для схематик event.shaped('create:schematic_table', [ @@ -168,12 +168,16 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:basin') .duration(200) .EUt(20) + .addMaterialInfo(true) // Место куда можно что то положить - event.shapeless('create:depot', [ - 'create:andesite_casing', - '#forge:double_plates/wrought_iron' - ]).id('tfg:create/shapeless/depot') + event.recipes.gtceu.shaped('create:depot', [ + 'A', + 'B' + ], { + A: '#forge:double_plates/wrought_iron', + B: 'create:andesite_casing' + }).addMaterialInfo().id('tfg:create/shaped/depot') // Лоток event.shaped('create:chute', [ @@ -191,15 +195,16 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:chute') .duration(200) .EUt(20) + .addMaterialInfo(true) // Металлический держатель - event.shaped('4x create:metal_bracket', [ + event.recipes.gtceu.shaped('4x create:metal_bracket', [ 'AAA', ' B ' ], { A: '#forge:bolts/wrought_iron', B: '#forge:plates/wrought_iron' - }).id('tfg:create/shaped/metal_bracket') + }).addMaterialInfo().id('tfg:create/shaped/metal_bracket') // Жидкостная труба event.shaped('create:fluid_pipe', [ @@ -215,6 +220,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:fluid_pipe') .duration(200) .EUt(20) + .addMaterialInfo(true) // Жидкостный люк event.shapeless('create:fluid_valve', [ @@ -239,6 +245,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:copper_valve_handle') .duration(200) .EUt(20) + .addMaterialInfo(true) // Жидкостный резервуар event.shaped('create:fluid_tank', [ @@ -259,6 +266,7 @@ const registerCreateRecipes = (event) => { .circuit(4) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) // Шкив для шланга event.shaped('create:hose_pulley', [ @@ -281,6 +289,8 @@ const registerCreateRecipes = (event) => { .circuit(1) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('create:hose_pulley', { 'copper': 3 }); + // Слив из предметов event.shaped('create:item_drain', [ 'A', @@ -307,6 +317,7 @@ const registerCreateRecipes = (event) => { .duration(50) .circuit(2) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) // Паровой двигатель event.shaped('create:steam_engine', [ @@ -327,6 +338,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:steam_engine') .duration(200) .EUt(32) + .addMaterialInfo(true) // Паровой свисток event.shaped('create:steam_whistle', [ @@ -345,6 +357,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:steam_whistle') .duration(200) .EUt(4) + .addMaterialInfo(true) // Рука поршня event.shaped('8x create:piston_extension_pole', [ @@ -363,6 +376,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('8x create:piston_extension_pole') .duration(200) .EUt(20) + .addMaterialInfo(true) // Редстоуновый вал event.shaped('8x create:gantry_shaft', [ @@ -381,6 +395,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('8x create:gantry_shaft') .duration(200) .EUt(20) + .addMaterialInfo(true) // Канатный шкиф event.shaped('create:rope_pulley', [ @@ -401,6 +416,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(22) + .addMaterialInfo(true) // Шкиф подъемника event.shaped('create:elevator_pulley', [ @@ -421,6 +437,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:elevator_pulley') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) // Сборщик вагонеток event.shaped('create:cart_assembler', [ @@ -440,6 +457,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(21) + .addMaterialInfo(true) // Контроллер рельсы event.shaped('4x create:controller_rail', [ @@ -453,30 +471,30 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/controller_rail') // Линейный переход - event.shaped('4x create:linear_chassis', [ + event.recipes.gtceu.shaped('4x create:linear_chassis', [ 'A A', 'CCC', 'A A' ], { A: '#forge:bolts/wrought_iron', C: '#minecraft:logs' - }).id('tfg:create/shaped/linear_chassis') + }).addMaterialInfo().id('tfg:create/shaped/linear_chassis') event.shapeless('create:linear_chassis', ['create:secondary_linear_chassis']) event.shapeless('create:secondary_linear_chassis', ['create:linear_chassis']) // Радиальный переход - event.shaped('3x create:radial_chassis', [ + event.recipes.gtceu.shaped('3x create:radial_chassis', [ 'ACA', ' C ', 'ACA' ], { A: '#forge:bolts/wrought_iron', C: '#minecraft:logs' - }).id('tfg:create/shaped/radial_chassis') + }).addMaterialInfo().id('tfg:create/shaped/radial_chassis') // Умный липкий поршень - event.shaped('create:sticker', [ + event.recipes.gtceu.shaped('create:sticker', [ 'ABA', 'CDC' ], { @@ -484,7 +502,7 @@ const registerCreateRecipes = (event) => { B: 'tfc:glue', C: '#forge:cobblestone', D: '#forge:dusts/redstone' - }).id('tfg:create/shaped/sticker') + }).addMaterialInfo().id('tfg:create/shaped/sticker') // Механическая бурилка event.shaped('create:mechanical_drill', [ @@ -549,6 +567,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('2x create:redstone_contact') .duration(200) .EUt(20) + .addMaterialInfo(true) // Механический собиратель event.shaped('create:mechanical_harvester', [ @@ -625,6 +644,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:andesite_casing') .duration(50) .EUt(4) + .addMaterialInfo(true) // Латунный корпус event.recipes.createItemApplication(['create:brass_casing'], ['#forge:stripped_logs', '#forge:plates/brass']) @@ -636,6 +656,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:brass_casing') .duration(50) .EUt(4) + .addMaterialInfo(true) // Медный корпус event.recipes.createItemApplication(['create:copper_casing'], ['#forge:stripped_logs', '#forge:plates/copper']) @@ -647,6 +668,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:copper_casing') .duration(50) .EUt(4) + .addMaterialInfo(true) // Корпус поезда event.recipes.createItemApplication(['create:railway_casing'], ['create:brass_casing', '#forge:plates/black_steel']) @@ -658,6 +680,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:railway_casing') .duration(50) .EUt(4) + .addMaterialInfo(true) // Механический крафтер event.shaped('create:mechanical_crafter', [ @@ -677,6 +700,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_crafter') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) // Маховик event.shaped('create:flywheel', [ @@ -708,6 +732,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:mechanical_arm') .duration(200) .EUt(20) + .addMaterialInfo(true) // Наблюдатель за поездом event.shapeless('create:track_observer', [ @@ -733,6 +758,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:item_vault') .duration(200) .EUt(20) + .addMaterialInfo(true) // Умный раздатчик/приемник из железа event.shaped('2x create:andesite_funnel', [ @@ -769,6 +795,8 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('create:andesite_funnel', { 'wrought_iron': 1 }); + // Умный раздатчик/приемник из латуни event.shaped('2x create:brass_funnel', [ ' E ', @@ -808,6 +836,8 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + TFGHelpers.registerMaterialInfo('create:brass_funnel', { 'brass': 1 }); + // Тунель из железа event.shaped('create:andesite_tunnel', [ ' D', @@ -842,6 +872,8 @@ const registerCreateRecipes = (event) => { .circuit(11) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + + TFGHelpers.registerMaterialInfo('create:andesite_tunnel', { 'wrought_iron': 1 }); // Тунель из латуни event.shaped('create:brass_tunnel', [ @@ -879,6 +911,8 @@ const registerCreateRecipes = (event) => { .circuit(13) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + + TFGHelpers.registerMaterialInfo('create:brass_tunnel', { 'brass': 1 }); // Дисплей столешница (чзх) event.shaped('create:display_board', [ @@ -1176,13 +1210,12 @@ const registerCreateRecipes = (event) => { ' ABA ', ' C ', ' D ', - ' E ' + ' D ' ], { A: '#forge:glass', B: 'minecraft:redstone_lamp', C: 'create:precision_mechanism', - D: '#forge:plates/brass', - E: 'minecraft:obsidian' + D: '#forge:rods/brass' }).id('tfg:create/mechanical_crafting/wand_of_symmetry') // Фильтр список @@ -1502,12 +1535,13 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:precision_mechanism') .duration(20 * 20) .EUt(20) + .addMaterialInfo(true) //#endregion // #region Water Wheels - event.shaped('create:water_wheel', [ + event.recipes.gtceu.shaped('create:water_wheel', [ 'ACA', 'CBC', 'ACA' @@ -1515,9 +1549,9 @@ const registerCreateRecipes = (event) => { A: 'gtceu:treated_wood_planks', B: 'create:andesite_casing', C: '#forge:rods/wrought_iron' - }).id('create:shaped/water_wheel') + }).addMaterialInfo().id('create:shaped/water_wheel') - event.shaped('create:large_water_wheel', [ + event.recipes.gtceu.shaped('create:large_water_wheel', [ 'ACA', 'CBC', 'ACA' @@ -1525,7 +1559,7 @@ const registerCreateRecipes = (event) => { A: 'gtceu:treated_wood_planks', B: 'create:water_wheel', C: '#forge:plates/steel' - }).id('create:shaped/large_water_wheel') + }).addMaterialInfo().id('create:shaped/large_water_wheel') // #endregion @@ -1551,6 +1585,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(1) + .addMaterialInfo(true) // #endregion @@ -1575,6 +1610,7 @@ const registerCreateRecipes = (event) => { .duration(50) .circuit(2) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) //#endregion @@ -1729,7 +1765,7 @@ const registerCreateRecipes = (event) => { .duration(200) .EUt(7) - event.shaped('2x create:packager', [ + event.recipes.gtceu.shaped('2x create:packager', [ 'AAA', 'BCD', 'EFE' @@ -1740,7 +1776,7 @@ const registerCreateRecipes = (event) => { D: 'create:bound_cardboard_block', E: 'create:electron_tube', F: '#tfg:metal_bars' - }).id('tfg:create/shaped/packager') + }).addMaterialInfo().id('tfg:create/shaped/packager') event.shaped('create:item_hatch', [ 'A', @@ -1768,6 +1804,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:item_hatch') .duration(200) .EUt(20) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:create/item_hatch_deco') .itemInputs('3x #forge:plates/wrought_iron', '#createdeco:metal_trapdoors') @@ -1798,6 +1835,7 @@ const registerCreateRecipes = (event) => { .circuit(20) .duration(200) .EUt(20) + .addMaterialInfo(true) event.shapeless('create:white_postbox', [ 'create:track_signal', @@ -1839,6 +1877,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:stock_link') .duration(150) .EUt(16) + .addMaterialInfo(true) event.recipes.gtceu.assembler('create:stock_link_tin') .itemInputs('create:andesite_casing', 'gtceu:item_detector_cover', '#gtceu:circuits/lv', 'create:transmitter') @@ -1888,6 +1927,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('2x create:factory_gauge') .duration(150) .EUt(16) + .addMaterialInfo(true) //#endregion @@ -2001,6 +2041,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(18) + .addMaterialInfo(true) event.shaped('create:wrench', [ ' BB', @@ -2073,6 +2114,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(17) + .addMaterialInfo(true) event.shaped('create:display_link', [ 'FED', @@ -2092,6 +2134,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:display_link') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.shaped('create:rotation_speed_controller', [ 'ECE', @@ -2152,6 +2195,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:sequenced_gearshift') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.shaped('create:mechanical_bearing', [ 'CBE', @@ -2172,6 +2216,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(15) + .addMaterialInfo(true) event.shaped('create:gantry_carriage', [ 'DCE', @@ -2192,6 +2237,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(2) + .addMaterialInfo(true) event.shaped('create:weighted_ejector', [ ' B ', @@ -2211,6 +2257,7 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) .circuit(16) + .addMaterialInfo(true) event.shaped('create:turntable', [ 'DA ', @@ -2246,6 +2293,7 @@ const registerCreateRecipes = (event) => { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.shaped('create:clutch', [ ' C ', @@ -2396,24 +2444,12 @@ const registerCreateRecipes = (event) => { .duration(50) .EUt(2) - event.recipes.gtceu.macerator('tfg:cut_asurine') - .itemInputs('create:cut_asurine') - .itemOutputs('#forge:dusts/asurine') - .duration(50) - .EUt(2) - event.recipes.gtceu.macerator('tfg:ochrum') .itemInputs('create:ochrum') .itemOutputs('#forge:dusts/ochrum') .duration(50) .EUt(2) - event.recipes.gtceu.macerator('tfg:cut_ochrum') - .itemInputs('create:cut_ochrum') - .itemOutputs('#forge:dusts/ochrum') - .duration(50) - .EUt(2) - event.shapeless('create:sand_paper', ['minecraft:paper', 'tfc:glue', '#forge:sand']) .id('tfg:shapeless/sand_paper') diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 4d40df0d7..91ea8892b 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -7,7 +7,7 @@ const registerCreateAdditionsRecipes = (event) => { event.remove({ mod: 'createaddition' }); // Прокатный стан - event.shaped('createaddition:rolling_mill', [ + event.recipes.gtceu.shaped('createaddition:rolling_mill', [ 'ABA', 'CBC', 'DED' @@ -17,10 +17,10 @@ const registerCreateAdditionsRecipes = (event) => { C: '#forge:double_plates/black_steel', D: '#gtceu:circuits/ulv', E: 'gtceu:ulv_machine_hull' - }).id('tfg:create_additions/shaped/rolling_mill') + }).addMaterialInfo().id('tfg:create_additions/shaped/rolling_mill') // Цифровой адаптер - event.shaped('createaddition:digital_adapter', [ + event.recipes.gtceu.shaped('createaddition:digital_adapter', [ 'ABA', 'BCB', 'ABA' @@ -28,10 +28,10 @@ const registerCreateAdditionsRecipes = (event) => { A: '#forge:plates/brass', B: 'gtceu:red_alloy_single_wire', C: 'computercraft:wired_modem', - }).id('tfg:create_additions/shaped/digital_adapter') + }).addMaterialInfo().id('tfg:create_additions/shaped/digital_adapter') // Портативный энергетический интерфейс - event.shaped('createaddition:portable_energy_interface', [ + event.recipes.gtceu.shaped('createaddition:portable_energy_interface', [ 'ABC', 'DEC', 'ADC' @@ -41,7 +41,7 @@ const registerCreateAdditionsRecipes = (event) => { C: 'gtceu:copper_octal_wire', D: 'gtceu:copper_single_cable', E: 'create:brass_casing' - }).id('tfg:create_additions/shaped/portable_energy_interface') + }).addMaterialInfo().id('tfg:create_additions/shaped/portable_energy_interface') // Батарейный блок event.recipes.gtceu.assembler('create_additions/battery') @@ -49,6 +49,7 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('createaddition:modular_accumulator') .duration(400) .EUt(30) + .addMaterialInfo(true) // Колючая проволка event.shapeless('4x createaddition:barbed_wire', [ @@ -69,8 +70,9 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) + .addMaterialInfo(true) - event.shaped('createaddition:electric_motor', [ + event.recipes.gtceu.shaped('createaddition:electric_motor', [ 'CCC', 'BDA', 'CCC' @@ -79,9 +81,9 @@ const registerCreateAdditionsRecipes = (event) => { B: 'create:rotation_speed_controller', C: 'gtceu:tin_single_cable', D: 'gtceu:lv_electric_motor', - }).id('tfg:createadditions/shaped/electric_motor') + }).addMaterialInfo().id('tfg:createadditions/shaped/electric_motor') - event.shaped('createaddition:alternator', [ + event.recipes.gtceu.shaped('createaddition:alternator', [ 'ABA', 'CDC', 'EFE' @@ -92,7 +94,7 @@ const registerCreateAdditionsRecipes = (event) => { D: 'gtceu:ulv_machine_hull', E: 'gtceu:tin_single_cable', F: '#forge:shafts' - }).id('tfg:createadditions/shaped/alternator') + }).addMaterialInfo().id('tfg:createadditions/shaped/alternator') event.shapeless('createaddition:diamond_grit_sandpaper', ['minecraft:paper', 'tfc:glue', '#forge:dusts/diamond']) diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index 2b5b0d0a4..737d75bb7 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -56,6 +56,7 @@ const registerCreateConnectedRecipes = (event) => { .itemOutputs('create_connected:item_silo') .duration(200) .EUt(20) + .addMaterialInfo(true) // Sequenced Pulse Generator event.shaped('create_connected:sequenced_pulse_generator', [ diff --git a/kubejs/server_scripts/create_factory_logistics/recipes.js b/kubejs/server_scripts/create_factory_logistics/recipes.js index d0af4d8ea..4ab0bee6b 100644 --- a/kubejs/server_scripts/create_factory_logistics/recipes.js +++ b/kubejs/server_scripts/create_factory_logistics/recipes.js @@ -24,9 +24,10 @@ function registerCreateFactoryLogisticsRecipes(event) { .itemOutputs('create_factory_logistics:fluid_mechanism') .duration(20 * 20) .EUt(20) + .addMaterialInfo(true) - event.shaped('2x create_factory_logistics:jar_packager', [ + event.recipes.gtceu.shaped('2x create_factory_logistics:jar_packager', [ 'AAA', 'BCD', 'EFE' @@ -37,7 +38,7 @@ function registerCreateFactoryLogisticsRecipes(event) { D: 'create:fluid_tank', E: 'create:electron_tube', F: '#tfg:metal_bars' - }).id('create_factory_logistics:shaped/jar_packager') + }).addMaterialInfo().id('create_factory_logistics:shaped/jar_packager') event.shapeless('create_factory_logistics:factory_fluid_gauge', ['create_factory_logistics:factory_fluid_gauge']) @@ -62,6 +63,7 @@ function registerCreateFactoryLogisticsRecipes(event) { .itemOutputs('2x create_factory_logistics:factory_fluid_gauge') .duration(150) .EUt(16) + .addMaterialInfo(true) event.shapeless('create_factory_logistics:network_link', ['create_factory_logistics:network_link']) @@ -87,6 +89,7 @@ function registerCreateFactoryLogisticsRecipes(event) { .itemOutputs('create_factory_logistics:network_link') .duration(150) .EUt(16) + .addMaterialInfo(true) event.recipes.gtceu.assembler('create_factory_logistics:network_link_tin') .itemInputs('create:brass_casing', 'gtceu:fluid_detector_cover', '#gtceu:circuits/lv', 'create:transmitter') diff --git a/kubejs/server_scripts/create_hypertube/recipes.js b/kubejs/server_scripts/create_hypertube/recipes.js index 5088c2364..39b640b69 100644 --- a/kubejs/server_scripts/create_hypertube/recipes.js +++ b/kubejs/server_scripts/create_hypertube/recipes.js @@ -8,6 +8,7 @@ function registerCreateHypertubeRecipes(event) { .itemOutputs('8x create_hypertube:hypertube') .EUt(GTValues.VA[GTValues.HV]) .duration(50) + .addMaterialInfo(true) event.recipes.gtceu.assembler('create_hypertube:entrance') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') @@ -15,6 +16,7 @@ function registerCreateHypertubeRecipes(event) { .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) .EUt(GTValues.VA[GTValues.HV]) .duration(100) + .addMaterialInfo(true) event.recipes.gtceu.assembler('create_hypertube:entrance_sbr') .itemInputs('4x #forge:plates/stainless_steel','create:smart_chute' ,'greate:stainless_steel_cogwheel', 'ae2:charged_certus_quartz_crystal') @@ -29,6 +31,7 @@ function registerCreateHypertubeRecipes(event) { .inputFluids(Fluid.of('gtceu:silicone_rubber', 288)) .EUt(GTValues.VA[GTValues.HV]) .duration(100) + .addMaterialInfo(true) event.recipes.gtceu.assembler('create_hypertube:accelerator_sbr') .itemInputs('2x #forge:plates/stainless_steel', 'greate:stainless_steel_cogwheel', 'ae2:fluix_crystal') diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 854be2d29..6cafbed10 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -2,596 +2,611 @@ const registerExtendedAE2Recipes = (event) => { - event.remove({not:[ - { id: 'expatternprovider:epp_part' }, - { id: 'expatternprovider:ei_part' }, - { id: 'expatternprovider:epp_alt' }, - { id: 'expatternprovider:ei_alt' }, - { id: 'expatternprovider:oversize_interface_alt' }, - { id: 'expatternprovider:oversize_interface_part' }, - ], mod: 'expatternprovider' }); - + event.remove({ + not: [ + { id: 'expatternprovider:epp_part' }, + { id: 'expatternprovider:ei_part' }, + { id: 'expatternprovider:epp_alt' }, + { id: 'expatternprovider:ei_alt' }, + { id: 'expatternprovider:oversize_interface_alt' }, + { id: 'expatternprovider:oversize_interface_part' }, + ], mod: 'expatternprovider' + }); - //#region Ext Interface - // IV - - event.recipes.gtceu.assembler('tfg:ex_interface_iv') - .itemInputs( - 'gtceu:iv_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '2x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) - .itemOutputs('expatternprovider:ex_interface') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(1) + //#region Ext Interface - // IV Moon Only - - event.recipes.gtceu.assembler('tfg:ex_interface_iv_moon') - .itemInputs( - 'gtceu:iv_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '2x #ae2:interface') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) - .itemOutputs('2x expatternprovider:ex_interface') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') - .circuit(1) + // IV - // ZPM + event.recipes.gtceu.assembler('tfg:ex_interface_iv') + .itemInputs( + 'gtceu:iv_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '2x #ae2:interface') + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) + .itemOutputs('expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - event.recipes.gtceu.assembler('tfg:ex_interface_zpm') - .itemInputs( - 'gtceu:zpm_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '16x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*32)) - .itemOutputs('16x expatternprovider:ex_interface') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(1) + // IV Moon Only - // ZPM Moon Only - - event.recipes.gtceu.assembler('tfg:ex_interface_zpm_moon') - .itemInputs( - 'gtceu:zpm_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '16x #ae2:interface') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) - .itemOutputs('32x expatternprovider:ex_interface') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .dimension('ad_astra:moon') - .circuit(1) + event.recipes.gtceu.assembler('tfg:ex_interface_iv_moon') + .itemInputs( + 'gtceu:iv_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '2x #ae2:interface') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) + .itemOutputs('2x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') + .circuit(1) - // Interface Upgrade + // ZPM - // IV - - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv') - .itemInputs( - 'gtceu:iv_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '1x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) - .itemOutputs('expatternprovider:interface_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(2) + event.recipes.gtceu.assembler('tfg:ex_interface_zpm') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:interface') + .inputFluids(Fluid.of('tfg:fluix', 144 * 32)) + .itemOutputs('16x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - // IV Moon Only - - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv_moon') - .itemInputs( - 'gtceu:iv_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) - .itemOutputs('2x expatternprovider:interface_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') - .circuit(2) + // ZPM Moon Only - // ZPM + event.recipes.gtceu.assembler('tfg:ex_interface_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:interface') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 32)) + .itemOutputs('32x expatternprovider:ex_interface') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm') - .itemInputs( - 'gtceu:zpm_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '8x #ae2:interface') - .inputFluids(Fluid.of('tfg:fluix', 144*32)) - .itemOutputs('16x expatternprovider:interface_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(2) + // Interface Upgrade - // ZPM Moon Only - - event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm_moon') - .itemInputs( - 'gtceu:zpm_conveyor_module', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) - .itemOutputs('32x expatternprovider:interface_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .dimension('ad_astra:moon') - .circuit(2) + // IV - //#endregion + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv') + .itemInputs( + 'gtceu:iv_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '1x #ae2:interface') + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) + .itemOutputs('expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - //#region Oversized Interface + // IV Moon Only - // IV + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_iv_moon') + .itemInputs( + 'gtceu:iv_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) + .itemOutputs('2x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') + .circuit(2) - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv') - .itemInputs( - '4x #expatternprovider:extended_interface', - '4x megacells:accumulation_processor', - 'gtceu:iv_robot_arm', - 'gtceu:iv_fluid_regulator', - '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/luv') - .inputFluids(Fluid.of('tfg:fluix', 144*9)) - .itemOutputs("expatternprovider:oversize_interface") - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) + // ZPM - // IV Moon + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '8x #ae2:interface') + .inputFluids(Fluid.of('tfg:fluix', 144 * 32)) + .itemOutputs('16x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv_moon') - .itemInputs( - '4x #expatternprovider:extended_interface', - '4x megacells:accumulation_processor', - 'gtceu:iv_robot_arm', - 'gtceu:iv_fluid_regulator', - '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/luv') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*9)) - .itemOutputs("4x expatternprovider:oversize_interface") - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') + // ZPM Moon Only - // ZPM + event.recipes.gtceu.assembler('expatternprovider:interface_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_conveyor_module', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 32)) + .itemOutputs('32x expatternprovider:interface_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') - .itemInputs( - '8x #expatternprovider:extended_interface', - '4x megacells:accumulation_processor', - 'gtceu:zpm_robot_arm', - 'gtceu:zpm_fluid_regulator', - '4x #forge:dense_plates/naquadah_alloy', - '#gtceu:circuits/uv') - .inputFluids(Fluid.of('tfg:fluix', 144*18)) - .itemOutputs("8x expatternprovider:oversize_interface") - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .cleanroom(CleanroomType.CLEANROOM) + //#endregion - // ZPM Moon + //#region Oversized Interface - event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm_moon') - .itemInputs( - '8x #expatternprovider:extended_interface', - '4x megacells:accumulation_processor', - 'gtceu:zpm_robot_arm', - 'gtceu:zpm_fluid_regulator', - '4x #forge:dense_plates/naquadah_alloy', - '#gtceu:circuits/uv') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*18)) - .itemOutputs("16x expatternprovider:oversize_interface") - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .dimension('ad_astra:moon') + // IV - //#endregion + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv') + .itemInputs( + '4x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:iv_robot_arm', + 'gtceu:iv_fluid_regulator', + '4x #forge:dense_plates/tungsten_steel', + '#gtceu:circuits/luv') + .inputFluids(Fluid.of('tfg:fluix', 144 * 9)) + .itemOutputs("expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) - //#region Ext Pattern Provider + // IV Moon - // IV - - event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv') - .itemInputs( - 'gtceu:iv_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '2x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) - .itemOutputs('expatternprovider:ex_pattern_provider') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(1) + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_iv_moon') + .itemInputs( + '4x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:iv_robot_arm', + 'gtceu:iv_fluid_regulator', + '4x #forge:dense_plates/tungsten_steel', + '#gtceu:circuits/luv') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 9)) + .itemOutputs("4x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') - // IV Moon Only - - event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv_moon') - .itemInputs( - 'gtceu:iv_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '2x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) - .itemOutputs('2x expatternprovider:ex_pattern_provider') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') - .circuit(1) + // ZPM - // ZPM + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm') + .itemInputs( + '8x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:zpm_robot_arm', + 'gtceu:zpm_fluid_regulator', + '4x #forge:dense_plates/naquadah_alloy', + '#gtceu:circuits/uv') + .inputFluids(Fluid.of('tfg:fluix', 144 * 18)) + .itemOutputs("8x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .cleanroom(CleanroomType.CLEANROOM) - event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm') - .itemInputs( - 'gtceu:zpm_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '16x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*32)) - .itemOutputs('16x expatternprovider:ex_pattern_provider') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(1) + // ZPM Moon - // ZPM Moon Only - - event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm_moon') - .itemInputs( - 'gtceu:zpm_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '16x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) - .itemOutputs('32x expatternprovider:ex_pattern_provider') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .dimension('ad_astra:moon') - .circuit(1) + event.recipes.gtceu.assembly_line('expatternprovider:oversize_interface_zpm_moon') + .itemInputs( + '8x #expatternprovider:extended_interface', + '4x megacells:accumulation_processor', + 'gtceu:zpm_robot_arm', + 'gtceu:zpm_fluid_regulator', + '4x #forge:dense_plates/naquadah_alloy', + '#gtceu:circuits/uv') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 18)) + .itemOutputs("16x expatternprovider:oversize_interface") + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') - // Pattern Provider Upgrade + //#endregion - // IV - - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv') - .itemInputs( - 'gtceu:iv_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor', - '1x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*8)) - .itemOutputs('expatternprovider:pattern_provider_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(2) + //#region Ext Pattern Provider - // IV Moon Only - - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv_moon') - .itemInputs( - 'gtceu:iv_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/tungsten_steel', - '4x ae2:annihilation_core', - '4x ae2:formation_core', - '2x megacells:accumulation_processor') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*8)) - .itemOutputs('2x expatternprovider:pattern_provider_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') - .circuit(2) + // IV - // ZPM + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv') + .itemInputs( + 'gtceu:iv_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '2x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) + .itemOutputs('expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm') - .itemInputs( - 'gtceu:zpm_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor', - '8x #ae2:pattern_provider') - .inputFluids(Fluid.of('tfg:fluix', 144*32)) - .itemOutputs('16x expatternprovider:pattern_provider_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .cleanroom(CleanroomType.CLEANROOM) - .circuit(2) + // IV Moon Only - // ZPM Moon Only - - event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm_moon') - .itemInputs( - 'gtceu:zpm_robot_arm', - '8x gtceu:laminated_glass', - '4x #forge:plates/naquadah_alloy', - '16x ae2:annihilation_core', - '16x ae2:formation_core', - '8x megacells:accumulation_processor') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*32)) - .itemOutputs('32x expatternprovider:pattern_provider_upgrade') - .duration(300) - .EUt(GTValues.VA[GTValues.ZPM]) - .dimension('ad_astra:moon') - .circuit(2) + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_iv_moon') + .itemInputs( + 'gtceu:iv_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '2x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) + .itemOutputs('2x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') + .circuit(1) - //#endregion + // ZPM - //#region bus + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144 * 32)) + .itemOutputs('16x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(1) - //ex import bus part - event.recipes.gtceu.assembler('expatternprovider:ex_import_bus_part') - .itemInputs( - '1x #forge:plates/stainless_steel', - '2x ae2:annihilation_core', - '2x gtceu:hv_robot_arm', - '1x megacells:accumulation_processor') - .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144)) - .itemOutputs('expatternprovider:ex_import_bus_part') - .circuit(2) - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + // ZPM Moon Only - //ex export bus part - event.recipes.gtceu.assembler('expatternprovider:ex_export_bus_part') - .itemInputs( - '1x #forge:plates/stainless_steel', - '2x ae2:formation_core', - '2x gtceu:hv_robot_arm', - '1x megacells:accumulation_processor') - .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144)) - .itemOutputs('expatternprovider:ex_export_bus_part') - .circuit(3) - .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + event.recipes.gtceu.assembler('tfg:ex_pattern_provider_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '16x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 32)) + .itemOutputs('32x expatternprovider:ex_pattern_provider') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(1) - //tag export bus - event.recipes.gtceu.assembler('expatternprovider:tag_export_bus') - .itemInputs( - 'ae2:export_bus', - '2x ae2:logic_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:tag_export_bus') - .duration(100) - .EUt(480) + // Pattern Provider Upgrade - //tag storage bus - event.recipes.gtceu.assembler('expatternprovider:tag_storage_bus') - .itemInputs( - 'ae2:storage_bus', - '2x ae2:logic_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:tag_storage_bus') - .duration(100) - .EUt(480) + // IV - //mod export bus - event.recipes.gtceu.assembler('expatternprovider:mod_export_bus') - .itemInputs( - 'ae2:export_bus', - '2x ae2:calculation_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:mod_export_bus') - .duration(100) - .EUt(480) + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv') + .itemInputs( + 'gtceu:iv_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor', + '1x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144 * 8)) + .itemOutputs('expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - //mod storage bus - event.recipes.gtceu.assembler('expatternprovider:mod_storage_bus') - .itemInputs( - 'ae2:storage_bus', - '2x ae2:calculation_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:mod_storage_bus') - .duration(100) - .EUt(480) + // IV Moon Only - //precise export bus - event.recipes.gtceu.assembler('expatternprovider:precise_export_bus') - .itemInputs( - 'ae2:export_bus', - '2x ae2:engineering_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:precise_export_bus') - .duration(100) - .EUt(480) + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_iv_moon') + .itemInputs( + 'gtceu:iv_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/tungsten_steel', + '4x ae2:annihilation_core', + '4x ae2:formation_core', + '2x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 8)) + .itemOutputs('2x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') + .circuit(2) - //precise storage bus - event.recipes.gtceu.assembler('expatternprovider:precise_storage_bus') - .itemInputs( - 'ae2:storage_bus', - '2x ae2:engineering_processor', - '#gtceu:circuits/ulv') - .itemOutputs('expatternprovider:precise_storage_bus') - .duration(100) - .EUt(480) + // ZPM - //threshold export bus - event.recipes.gtceu.assembler('expatternprovider:threshold_export_bus') - .itemInputs( - 'ae2:export_bus', - '2x ae2:logic_processor', - 'ae2:level_emitter') - .itemOutputs('expatternprovider:threshold_export_bus') - .duration(100) - .EUt(480) + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor', + '8x #ae2:pattern_provider') + .inputFluids(Fluid.of('tfg:fluix', 144 * 32)) + .itemOutputs('16x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .cleanroom(CleanroomType.CLEANROOM) + .circuit(2) - //#endregion + // ZPM Moon Only - //active formation plane - event.recipes.gtceu.assembler('expatternprovider:active_formation_plane') - .itemInputs( - 'ae2:formation_plane', - 'ae2:export_bus', - '2x ae2:engineering_processor') - .itemOutputs('expatternprovider:active_formation_plane') - .duration(100) - .EUt(480) + event.recipes.gtceu.assembler('expatternprovider:pattern_provider_upgrade_zpm_moon') + .itemInputs( + 'gtceu:zpm_robot_arm', + '8x gtceu:laminated_glass', + '4x #forge:plates/naquadah_alloy', + '16x ae2:annihilation_core', + '16x ae2:formation_core', + '8x megacells:accumulation_processor') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 32)) + .itemOutputs('32x expatternprovider:pattern_provider_upgrade') + .duration(300) + .EUt(GTValues.VA[GTValues.ZPM]) + .dimension('ad_astra:moon') + .circuit(2) - //pattern modifier - event.recipes.gtceu.assembler('expatternprovider:pattern_modifier') - .itemInputs( - 'ae2:blank_pattern', - 'ae2:logic_processor') - .inputFluids(Fluid.of('tfc:green_dye', 144)) - .itemOutputs('expatternprovider:pattern_modifier') - .duration(100) - .EUt(480) + //#endregion - //threshold level emitter - event.recipes.gtceu.assembler('expatternprovider:threshold_level_emitter') - .itemInputs( - 'ae2:level_emitter', - '2x minecraft:redstone_torch', - '2x ae2:calculation_processor') - .itemOutputs('expatternprovider:threshold_level_emitter') - .duration(100) - .EUt(480) - - //wireless tool - event.recipes.gtceu.assembler('expatternprovider:wireless_tool') - .itemInputs( - '3x #forge:plates/steel', - '#gtceu:circuits/ev', - '2x gtceu:ev_emitter', - '2x ae2:wireless_receiver', - 'ae2:calculation_processor') - .itemOutputs('expatternprovider:wireless_tool') - .duration(100) - .EUt(1920) + //#region bus - //wireless tool - event.recipes.gtceu.assembler('expatternprovider:wireless_connect') - .itemInputs( - '2x gtceu:iv_machine_casing', - '4x #gtceu:circuits/iv', - '8x ae2:wireless_receiver', - '4x gtceu:iv_emitter', - '4x gtceu:iv_sensor', - '8x ae2:engineering_processor', - '4x megacells:accumulation_processor') - .itemOutputs('2x expatternprovider:wireless_connect') - .duration(200) - .EUt(7580) + //ex import bus part + event.recipes.gtceu.assembler('expatternprovider:ex_import_bus_part') + .itemInputs( + '1x #forge:plates/stainless_steel', + '2x ae2:annihilation_core', + '2x gtceu:hv_robot_arm', + '1x megacells:accumulation_processor') + .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144)) + .itemOutputs('expatternprovider:ex_import_bus_part') + .circuit(2) + .duration(200) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) - //me packing tape - event.recipes.gtceu.assembler('expatternprovider:me_packing_tape') - .itemInputs( - '4x #forge:dusts/fluix', - '2x #forge:plates/paper') - .inputFluids(Fluid.of('gtceu:glue', 144)) - .itemOutputs(Item.of('expatternprovider:me_packing_tape', '{Damage:0}')) - .duration(100) - .EUt(GTValues.VA[GTValues.MV]) + //ex export bus part + event.recipes.gtceu.assembler('expatternprovider:ex_export_bus_part') + .itemInputs( + '1x #forge:plates/stainless_steel', + '2x ae2:formation_core', + '2x gtceu:hv_robot_arm', + '1x megacells:accumulation_processor') + .inputFluids(Fluid.of('gtceu:polyvinyl_chloride', 144)) + .itemOutputs('expatternprovider:ex_export_bus_part') + .circuit(3) + .duration(200) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) - //ex pattern access - event.recipes.gtceu.assembler('expatternprovider:ex_pattern_access_part') - .itemInputs( - 'ae2:pattern_access_terminal', - '4x ae2:logic_processor', - '2x megacells:accumulation_processor') - .itemOutputs('expatternprovider:ex_pattern_access_part') - .duration(100) - .EUt(GTValues.VA[GTValues.EV]) + //tag export bus + event.recipes.gtceu.assembler('expatternprovider:tag_export_bus') + .itemInputs( + 'ae2:export_bus', + '2x ae2:logic_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:tag_export_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - event.recipes.gtceu.assembler('expatternprovider:pattern_terminal_upgrade') - .itemInputs( - '4x ae2:logic_processor', - '2x megacells:accumulation_processor') - .itemOutputs('expatternprovider:pattern_terminal_upgrade') - .duration(100) - .circuit(2) - .EUt(GTValues.VA[GTValues.EV]) + //tag storage bus + event.recipes.gtceu.assembler('expatternprovider:tag_storage_bus') + .itemInputs( + 'ae2:storage_bus', + '2x ae2:logic_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:tag_storage_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - // Wireless Crafting Terminal - event.recipes.gtceu.assembler('expatternprovider:wireless_ex_pat') - .itemInputs( - '2x gtceu:hv_lithium_battery', - '2x gtceu:iv_sensor', - 'gtceu:iv_emitter', - '2x #forge:rods/iridium', - 'ae2:wireless_terminal', - 'expatternprovider:ex_pattern_access_part') - .itemOutputs('expatternprovider:wireless_ex_pat') - .duration(30) - .EUt(GTValues.VA[GTValues.IV]) + //mod export bus + event.recipes.gtceu.assembler('expatternprovider:mod_export_bus') + .itemInputs( + 'ae2:export_bus', + '2x ae2:calculation_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:mod_export_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - event.shapeless('ae2wtlib:wireless_universal_terminal', ['expatternprovider:wireless_ex_pat', 'ae2wtlib:wireless_universal_terminal']) - .modifyResult((grid, result) => { - let orig = grid.find(Item.of('ae2wtlib:wireless_universal_terminal').ignoreNBT()) - result = result.withNBT(orig.nbt); + //mod storage bus + event.recipes.gtceu.assembler('expatternprovider:mod_storage_bus') + .itemInputs( + 'ae2:storage_bus', + '2x ae2:calculation_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:mod_storage_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - if (orig.nbt == null) { - result.nbt = { ex_pattern_access: true }; - } - else { - result.nbt.put('ex_pattern_access', true); - } + //precise export bus + event.recipes.gtceu.assembler('expatternprovider:precise_export_bus') + .itemInputs( + 'ae2:export_bus', + '2x ae2:engineering_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:precise_export_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - return result; - }) - - //#region ex molecular assembler + //precise storage bus + event.recipes.gtceu.assembler('expatternprovider:precise_storage_bus') + .itemInputs( + 'ae2:storage_bus', + '2x ae2:engineering_processor', + '#gtceu:circuits/ulv') + .itemOutputs('expatternprovider:precise_storage_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) - // IV + //threshold export bus + event.recipes.gtceu.assembler('expatternprovider:threshold_export_bus') + .itemInputs( + 'ae2:export_bus', + '2x ae2:logic_processor', + 'ae2:level_emitter') + .itemOutputs('expatternprovider:threshold_export_bus') + .duration(100) + .EUt(480) + .addMaterialInfo(true) + + //#endregion + + //active formation plane + event.recipes.gtceu.assembler('expatternprovider:active_formation_plane') + .itemInputs( + 'ae2:formation_plane', + 'ae2:export_bus', + '2x ae2:engineering_processor') + .itemOutputs('expatternprovider:active_formation_plane') + .duration(100) + .EUt(480) + .addMaterialInfo(true) + + //pattern modifier + event.recipes.gtceu.assembler('expatternprovider:pattern_modifier') + .itemInputs( + 'ae2:blank_pattern', + 'ae2:logic_processor') + .inputFluids(Fluid.of('tfc:green_dye', 144)) + .itemOutputs('expatternprovider:pattern_modifier') + .duration(100) + .EUt(480) + .addMaterialInfo(true) + + //threshold level emitter + event.recipes.gtceu.assembler('expatternprovider:threshold_level_emitter') + .itemInputs( + 'ae2:level_emitter', + '2x minecraft:redstone_torch', + '2x ae2:calculation_processor') + .itemOutputs('expatternprovider:threshold_level_emitter') + .duration(100) + .EUt(480) + .addMaterialInfo(true) + + //wireless tool + event.recipes.gtceu.assembler('expatternprovider:wireless_tool') + .itemInputs( + '3x #forge:plates/steel', + '#gtceu:circuits/ev', + '2x gtceu:ev_emitter', + '2x ae2:wireless_receiver', + 'ae2:calculation_processor') + .itemOutputs('expatternprovider:wireless_tool') + .duration(100) + .EUt(1920) + + //wireless tool + event.recipes.gtceu.assembler('expatternprovider:wireless_connect') + .itemInputs( + '2x gtceu:iv_machine_casing', + '4x #gtceu:circuits/iv', + '8x ae2:wireless_receiver', + '4x gtceu:iv_emitter', + '4x gtceu:iv_sensor', + '8x ae2:engineering_processor', + '4x megacells:accumulation_processor') + .itemOutputs('2x expatternprovider:wireless_connect') + .duration(200) + .EUt(7580) + .addMaterialInfo(true) + + //me packing tape + event.recipes.gtceu.assembler('expatternprovider:me_packing_tape') + .itemInputs( + '4x #forge:dusts/fluix', + '2x #forge:plates/paper') + .inputFluids(Fluid.of('gtceu:glue', 144)) + .itemOutputs(Item.of('expatternprovider:me_packing_tape', '{Damage:0}')) + .duration(100) + .EUt(GTValues.VA[GTValues.MV]) + + //ex pattern access + event.recipes.gtceu.assembler('expatternprovider:ex_pattern_access_part') + .itemInputs( + 'ae2:pattern_access_terminal', + '4x ae2:logic_processor', + '2x megacells:accumulation_processor') + .itemOutputs('expatternprovider:ex_pattern_access_part') + .duration(100) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.assembler('expatternprovider:pattern_terminal_upgrade') + .itemInputs( + '4x ae2:logic_processor', + '2x megacells:accumulation_processor') + .itemOutputs('expatternprovider:pattern_terminal_upgrade') + .duration(100) + .circuit(2) + .EUt(GTValues.VA[GTValues.EV]) + + // Wireless Crafting Terminal + event.recipes.gtceu.assembler('expatternprovider:wireless_ex_pat') + .itemInputs( + '2x gtceu:hv_lithium_battery', + '2x gtceu:iv_sensor', + 'gtceu:iv_emitter', + '2x #forge:rods/iridium', + 'ae2:wireless_terminal', + 'expatternprovider:ex_pattern_access_part') + .itemOutputs('expatternprovider:wireless_ex_pat') + .duration(30) + .EUt(GTValues.VA[GTValues.IV]) + + event.shapeless('ae2wtlib:wireless_universal_terminal', ['expatternprovider:wireless_ex_pat', 'ae2wtlib:wireless_universal_terminal']) + .modifyResult((grid, result) => { + let orig = grid.find(Item.of('ae2wtlib:wireless_universal_terminal').ignoreNBT()) + result = result.withNBT(orig.nbt); + + if (orig.nbt == null) { + result.nbt = { ex_pattern_access: true }; + } + else { + result.nbt.put('ex_pattern_access', true); + } + + return result; + }) + + //#region ex molecular assembler + + // IV event.recipes.gtceu.assembler('expatternprovider:ex_molecular_assembler_iv') .itemInputs( '2x #gtceu:circuits/iv', @@ -600,10 +615,10 @@ const registerExtendedAE2Recipes = (event) => { '4x ae2:formation_core', '2x gtceu:iv_robot_arm', 'ae2:molecular_assembler') - .inputFluids(Fluid.of('tfg:fluix', 144*4)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 4)) .itemOutputs('expatternprovider:ex_molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.IV]) + .EUt(GTValues.VA[GTValues.IV]) .cleanroom(CleanroomType.CLEANROOM) // LuV Moon @@ -615,10 +630,10 @@ const registerExtendedAE2Recipes = (event) => { '4x ae2:formation_core', '2x gtceu:luv_robot_arm', '2x ae2:molecular_assembler') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*4)) + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 4)) .itemOutputs('4x expatternprovider:ex_molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.LuV]) + .EUt(GTValues.VA[GTValues.LuV]) .dimension('ad_astra:moon') // ZPM @@ -630,231 +645,236 @@ const registerExtendedAE2Recipes = (event) => { '4x ae2:formation_core', '2x gtceu:zpm_robot_arm', '4x ae2:molecular_assembler') - .inputFluids(Fluid.of('tfg:fluix', 144*16)) + .inputFluids(Fluid.of('tfg:fluix', 144 * 16)) .itemOutputs('8x expatternprovider:ex_molecular_assembler') .duration(200) - .EUt(GTValues.VA[GTValues.ZPM]) + .EUt(GTValues.VA[GTValues.ZPM]) .cleanroom(CleanroomType.CLEANROOM) - //#endregion + //#endregion - //ex io port - event.recipes.gtceu.assembler('expatternprovider:ex_io_port') - .itemInputs( - 'gtceu:ev_machine_casing', - 'ae2:io_port', - '2x megacells:accumulation_processor', - '4x ae2:logic_processor', - '4x ae2:engineering_processor', - '4x ae2:speed_card') - .itemOutputs('expatternprovider:ex_io_port') - .duration(200) - .EUt(1000) - - event.recipes.gtceu.assembler('expatternprovider:ex_drive') - .itemInputs( - 'gtceu:ev_machine_casing', - 'ae2:drive', - '2x megacells:accumulation_processor', - '4x ae2:logic_processor', - '4x ae2:engineering_processor', - '2x ae2:capacity_card') - .itemOutputs('expatternprovider:ex_drive') - .duration(200) - .EUt(1920) + //ex io port + event.recipes.gtceu.assembler('expatternprovider:ex_io_port') + .itemInputs( + 'gtceu:ev_machine_casing', + 'ae2:io_port', + '2x megacells:accumulation_processor', + '4x ae2:logic_processor', + '4x ae2:engineering_processor', + '4x ae2:speed_card') + .itemOutputs('expatternprovider:ex_io_port') + .duration(200) + .EUt(1000) + .addMaterialInfo(true) - event.recipes.gtceu.assembler('expatternprovider:drive_upgrade') - .itemInputs( - 'gtceu:ev_machine_casing', - '2x megacells:accumulation_processor', - '4x ae2:logic_processor', - '4x ae2:engineering_processor', - '2x ae2:capacity_card') - .itemOutputs('expatternprovider:drive_upgrade') - .duration(200) - .circuit(2) - .EUt(1920) + event.recipes.gtceu.assembler('expatternprovider:ex_drive') + .itemInputs( + 'gtceu:ev_machine_casing', + 'ae2:drive', + '2x megacells:accumulation_processor', + '4x ae2:logic_processor', + '4x ae2:engineering_processor', + '2x ae2:capacity_card') + .itemOutputs('expatternprovider:ex_drive') + .duration(200) + .EUt(1920) + .addMaterialInfo(true) - event.recipes.gtceu.assembler('expatternprovider:ingredient_buffer') - .itemInputs( - 'gtceu:hv_machine_casing', - '2x ae2:quartz_vibrant_glass', - 'gtceu:stainless_steel_drum', - '2x ae2:cell_component_1k', - 'gtceu:hv_robot_arm', - 'gtceu:hv_electric_pump') - .itemOutputs('expatternprovider:ingredient_buffer') - .duration(200) - .EUt(1920) + event.recipes.gtceu.assembler('expatternprovider:drive_upgrade') + .itemInputs( + 'gtceu:ev_machine_casing', + '2x megacells:accumulation_processor', + '4x ae2:logic_processor', + '4x ae2:engineering_processor', + '2x ae2:capacity_card') + .itemOutputs('expatternprovider:drive_upgrade') + .duration(200) + .circuit(2) + .EUt(1920) - //#endregion + event.recipes.gtceu.assembler('expatternprovider:ingredient_buffer') + .itemInputs( + 'gtceu:hv_machine_casing', + '2x ae2:quartz_vibrant_glass', + 'gtceu:stainless_steel_drum', + '2x ae2:cell_component_1k', + 'gtceu:hv_robot_arm', + 'gtceu:hv_electric_pump') + .itemOutputs('expatternprovider:ingredient_buffer') + .duration(200) + .EUt(1920) + .addMaterialInfo(true) - //#region Matrix + //#endregion - //Frame + //#region Matrix - event.recipes.gtceu.assembly_line('expatternprovider:assembler_matrix_frame') - .itemInputs( - '4x gtceu:plascrete', - '4x gtceu:luv_machine_casing', - '1x #gtceu:circuits/iv', - '4x ae2:logic_processor', - '4x megacells:accumulation_processor', - '16x #forge:rods/niobium_nitride', - '1x expatternprovider:ex_molecular_assembler') - .inputFluids( - Fluid.of("gtceu:concrete", 144*8), - Fluid.of('tfg:fluix', 144*16)) - .itemOutputs('expatternprovider:assembler_matrix_frame') - .duration(2000) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + //Frame - event.recipes.gtceu.assembly_line('expatternprovider:assembler_matrix_frame_moon') - .itemInputs( - '8x gtceu:plascrete', - '8x gtceu:iv_machine_casing', - '1x #gtceu:circuits/iv', - '4x ae2:logic_processor', - '4x megacells:accumulation_processor', - '16x #forge:rods/niobium_nitride', - '4x expatternprovider:ex_molecular_assembler') - .inputFluids( - Fluid.of('gtceu:concrete', 144*8), - Fluid.of('tfg:cryogenized_fluix', 144*16)) - .itemOutputs('8x expatternprovider:assembler_matrix_frame') - .duration(2000) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') + event.recipes.gtceu.assembly_line('expatternprovider:assembler_matrix_frame') + .itemInputs( + '4x gtceu:plascrete', + '4x gtceu:luv_machine_casing', + '1x #gtceu:circuits/iv', + '4x ae2:logic_processor', + '4x megacells:accumulation_processor', + '16x #forge:rods/niobium_nitride', + '1x expatternprovider:ex_molecular_assembler') + .inputFluids( + Fluid.of("gtceu:concrete", 144 * 8), + Fluid.of('tfg:fluix', 144 * 16)) + .itemOutputs('expatternprovider:assembler_matrix_frame') + .duration(2000) + .EUt(GTValues.VA[GTValues.LuV]) + .cleanroom(CleanroomType.CLEANROOM) - //Matrix Wall + event.recipes.gtceu.assembly_line('expatternprovider:assembler_matrix_frame_moon') + .itemInputs( + '8x gtceu:plascrete', + '8x gtceu:iv_machine_casing', + '1x #gtceu:circuits/iv', + '4x ae2:logic_processor', + '4x megacells:accumulation_processor', + '16x #forge:rods/niobium_nitride', + '4x expatternprovider:ex_molecular_assembler') + .inputFluids( + Fluid.of('gtceu:concrete', 144 * 8), + Fluid.of('tfg:cryogenized_fluix', 144 * 16)) + .itemOutputs('8x expatternprovider:assembler_matrix_frame') + .duration(2000) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') - event.recipes.gtceu.assembler('expatternprovider:assembler_matrix_wall_luv') - .itemInputs( - '#forge:frames/polytetrafluoroethylene', - 'gtceu:plascrete', - '6x gtceu:polytetrafluoroethylene_plate') - .inputFluids( - Fluid.of('gtceu:concrete', 144*4)) - .itemOutputs('expatternprovider:assembler_matrix_wall') - .duration(800) - .EUt(GTValues.VA[GTValues.IV]) + //Matrix Wall - //Matrix Glass + event.recipes.gtceu.assembler('expatternprovider:assembler_matrix_wall_luv') + .itemInputs( + '#forge:frames/polytetrafluoroethylene', + 'gtceu:plascrete', + '6x gtceu:polytetrafluoroethylene_plate') + .inputFluids( + Fluid.of('gtceu:concrete', 144 * 4)) + .itemOutputs('expatternprovider:assembler_matrix_wall') + .duration(800) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) - event.recipes.gtceu.assembler("expatternprovider:assembler_matrix_glass") - .itemInputs( - '#forge:frames/polytetrafluoroethylene', - 'gtceu:cleanroom_glass', - '6x gtceu:polytetrafluoroethylene_plate') - .inputFluids( - Fluid.of('gtceu:concrete', 144*4)) - .itemOutputs("expatternprovider:assembler_matrix_glass") - .duration(800) - .EUt(GTValues.VA[GTValues.IV]) + //Matrix Glass - //Matrix Pattern + event.recipes.gtceu.assembler("expatternprovider:assembler_matrix_glass") + .itemInputs( + '#forge:frames/polytetrafluoroethylene', + 'gtceu:cleanroom_glass', + '6x gtceu:polytetrafluoroethylene_plate') + .inputFluids( + Fluid.of('gtceu:concrete', 144 * 4)) + .itemOutputs("expatternprovider:assembler_matrix_glass") + .duration(800) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_pattern") - .itemInputs( - '#expatternprovider:extended_pattern_provider', - '8x megacells:accumulation_processor', - '4x gtceu:luv_robot_arm', - '2x #forge:dense_plates/rhodium_plated_palladium', - '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv') - .inputFluids( - Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('expatternprovider:assembler_matrix_pattern') - .duration(20*30) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + //Matrix Pattern - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_pattern_moon") - .itemInputs( - '2x #expatternprovider:extended_pattern_provider', - '8x megacells:accumulation_processor', - '4x gtceu:iv_robot_arm', - '2x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv') - .inputFluids( - Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('2x expatternprovider:assembler_matrix_pattern') - .duration(20*30) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_pattern") + .itemInputs( + '#expatternprovider:extended_pattern_provider', + '8x megacells:accumulation_processor', + '4x gtceu:luv_robot_arm', + '2x #forge:dense_plates/rhodium_plated_palladium', + '#gtceu:circuits/zpm', + '2x #gtceu:circuits/luv') + .inputFluids( + Fluid.of('tfg:fluix', 144 * 16), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('expatternprovider:assembler_matrix_pattern') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.LuV]) + .cleanroom(CleanroomType.CLEANROOM) - //Matrix Crafter + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_pattern_moon") + .itemInputs( + '2x #expatternprovider:extended_pattern_provider', + '8x megacells:accumulation_processor', + '4x gtceu:iv_robot_arm', + '2x #forge:dense_plates/tungsten_steel', + '#gtceu:circuits/luv', + '2x #gtceu:circuits/iv') + .inputFluids( + Fluid.of('tfg:cryogenized_fluix', 144 * 8), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('2x expatternprovider:assembler_matrix_pattern') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_crafter") - .itemInputs( - "#expatternprovider:oversize_interface", - '8x megacells:accumulation_processor', - '4x gtceu:luv_field_generator', - '2x #forge:dense_plates/rhodium_plated_palladium', - '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv') - .inputFluids( - Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('expatternprovider:assembler_matrix_crafter') - .duration(20*30) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) - - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_crafter_moon") - .itemInputs( - "2x #expatternprovider:oversize_interface", - '8x megacells:accumulation_processor', - '4x gtceu:iv_field_generator', - '2x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv') - .inputFluids( - Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('2x expatternprovider:assembler_matrix_crafter') - .duration(20*30) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') + //Matrix Crafter - //Matrix Speed + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_crafter") + .itemInputs( + "#expatternprovider:oversize_interface", + '8x megacells:accumulation_processor', + '4x gtceu:luv_field_generator', + '2x #forge:dense_plates/rhodium_plated_palladium', + '#gtceu:circuits/zpm', + '2x #gtceu:circuits/luv') + .inputFluids( + Fluid.of('tfg:fluix', 144 * 16), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('expatternprovider:assembler_matrix_crafter') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.LuV]) + .cleanroom(CleanroomType.CLEANROOM) - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_speed_luv") - .itemInputs( - "megacells:mega_crafting_accelerator", - '8x megacells:accumulation_processor', - '4x gtceu:luv_conveyor_module', - '2x #forge:dense_plates/rhodium_plated_palladium', - '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv') - .inputFluids( - Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('expatternprovider:assembler_matrix_speed') - .duration(20*30) - .EUt(GTValues.VA[GTValues.LuV]) - .cleanroom(CleanroomType.CLEANROOM) + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_crafter_moon") + .itemInputs( + "2x #expatternprovider:oversize_interface", + '8x megacells:accumulation_processor', + '4x gtceu:iv_field_generator', + '2x #forge:dense_plates/tungsten_steel', + '#gtceu:circuits/luv', + '2x #gtceu:circuits/iv') + .inputFluids( + Fluid.of('tfg:cryogenized_fluix', 144 * 8), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('2x expatternprovider:assembler_matrix_crafter') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') - event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_speed_zpm") - .itemInputs( - "2x megacells:mega_crafting_accelerator", - '8x megacells:accumulation_processor', - '4x gtceu:iv_conveyor_module', - '2x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv') - .inputFluids( - Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430)) - .itemOutputs('2x expatternprovider:assembler_matrix_speed') - .duration(20*30) - .EUt(GTValues.VA[GTValues.IV]) - .dimension('ad_astra:moon') + //Matrix Speed - //#endregion + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_speed_luv") + .itemInputs( + "megacells:mega_crafting_accelerator", + '8x megacells:accumulation_processor', + '4x gtceu:luv_conveyor_module', + '2x #forge:dense_plates/rhodium_plated_palladium', + '#gtceu:circuits/zpm', + '2x #gtceu:circuits/luv') + .inputFluids( + Fluid.of('tfg:fluix', 144 * 16), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('expatternprovider:assembler_matrix_speed') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.LuV]) + .cleanroom(CleanroomType.CLEANROOM) - } + event.recipes.gtceu.assembly_line("expatternprovider:assembler_matrix_speed_zpm") + .itemInputs( + "2x megacells:mega_crafting_accelerator", + '8x megacells:accumulation_processor', + '4x gtceu:iv_conveyor_module', + '2x #forge:dense_plates/tungsten_steel', + '#gtceu:circuits/luv', + '2x #gtceu:circuits/iv') + .inputFluids( + Fluid.of('tfg:cryogenized_fluix', 144 * 8), + Fluid.of('gtceu:polybenzimidazole', 1430)) + .itemOutputs('2x expatternprovider:assembler_matrix_speed') + .duration(20 * 30) + .EUt(GTValues.VA[GTValues.IV]) + .dimension('ad_astra:moon') + + //#endregion + +} diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 2f06b831e..6dd356a5c 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -72,13 +72,13 @@ const registerFirmaLifeRecipes = (event) => { }).id('firmalife:crafting/jarring_station') // Vat - event.shaped('firmalife:vat', [ + event.recipes.gtceu.shaped('firmalife:vat', [ 'A A', 'BAB' ], { A: '#forge:plates/wrought_iron', B: '#forge:wax' - }).id('firmalife:crafting/vat') + }).addMaterialInfo().id('firmalife:crafting/vat') // Jar Lid event.recipes.gtceu.fluid_solidifier(`tfg:firmalife/jar_lid`) @@ -203,74 +203,75 @@ const registerFirmaLifeRecipes = (event) => { .itemOutputs('firmalife:sprinkler') .duration(60) .EUt(8) + .addMaterialInfo(true) // Стена - event.shaped('8x firmalife:copper_greenhouse_wall', [ + event.recipes.gtceu.shaped('8x firmalife:copper_greenhouse_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/copper', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_wall') // Панель - event.shaped('8x firmalife:copper_greenhouse_panel_wall', [ + event.recipes.gtceu.shaped('8x firmalife:copper_greenhouse_panel_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/copper', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_panel_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_panel_wall') // Панельная Крыша - event.shaped('4x firmalife:copper_greenhouse_panel_roof', [ + event.recipes.gtceu.shaped('4x firmalife:copper_greenhouse_panel_roof', [ 'A ', 'BA ', 'BBA' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/copper' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_panel_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_panel_roof') // Крыша - event.shaped('4x firmalife:copper_greenhouse_roof', [ + event.recipes.gtceu.shaped('4x firmalife:copper_greenhouse_roof', [ 'A ', 'BA ', 'BBA' ], { A: '#forge:rods/copper', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_roof') // Верхушка крыши - event.shaped('8x firmalife:copper_greenhouse_roof_top', [ + event.recipes.gtceu.shaped('8x firmalife:copper_greenhouse_roof_top', [ 'ABA', 'BAB' ], { A: '#forge:rods/copper', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_roof_top') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_roof_top') // Люк - event.shaped('8x firmalife:copper_greenhouse_trapdoor', [ + event.recipes.gtceu.shaped('8x firmalife:copper_greenhouse_trapdoor', [ 'ABA', 'BAB' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/copper' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_trapdoor') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_trapdoor') // Дверь - event.shaped('2x firmalife:copper_greenhouse_door', [ + event.recipes.gtceu.shaped('2x firmalife:copper_greenhouse_door', [ 'AB', 'AB', 'AB' ], { A: '#forge:rods/copper', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/copper_greenhouse_door') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/copper_greenhouse_door') event.shapeless('firmalife:copper_greenhouse_port', [ 'firmalife:copper_greenhouse_wall', @@ -283,72 +284,72 @@ const registerFirmaLifeRecipes = (event) => { //#region Железная / Iron // Стена - event.shaped('8x firmalife:iron_greenhouse_wall', [ + event.recipes.gtceu.shaped('8x firmalife:iron_greenhouse_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/wrought_iron', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_wall') // Панель - event.shaped('8x firmalife:iron_greenhouse_panel_wall', [ + event.recipes.gtceu.shaped('8x firmalife:iron_greenhouse_panel_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/wrought_iron', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_panel_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_panel_wall') // Панельная Крыша - event.shaped('4x firmalife:iron_greenhouse_panel_roof', [ + event.recipes.gtceu.shaped('4x firmalife:iron_greenhouse_panel_roof', [ 'A ', 'BA ', 'BBA' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/wrought_iron' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_panel_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_panel_roof') // Крыша - event.shaped('4x firmalife:iron_greenhouse_roof', [ + event.recipes.gtceu.shaped('4x firmalife:iron_greenhouse_roof', [ 'A ', 'BA ', 'BBA' ], { A: '#forge:rods/wrought_iron', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_roof') // Верхушка крыши - event.shaped('8x firmalife:iron_greenhouse_roof_top', [ + event.recipes.gtceu.shaped('8x firmalife:iron_greenhouse_roof_top', [ 'ABA', 'BAB' ], { A: '#forge:rods/wrought_iron', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_roof_top') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_roof_top') // Люк - event.shaped('8x firmalife:iron_greenhouse_trapdoor', [ + event.recipes.gtceu.shaped('8x firmalife:iron_greenhouse_trapdoor', [ 'ABA', 'BAB' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/wrought_iron' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_trapdoor') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_trapdoor') // Дверь - event.shaped('2x firmalife:iron_greenhouse_door', [ + event.recipes.gtceu.shaped('2x firmalife:iron_greenhouse_door', [ 'AB', 'AB', 'AB' ], { A: '#forge:rods/wrought_iron', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/iron_greenhouse_door') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/iron_greenhouse_door') event.shapeless('firmalife:iron_greenhouse_port', [ 'firmalife:iron_greenhouse_wall', @@ -360,69 +361,69 @@ const registerFirmaLifeRecipes = (event) => { //#region Нержавеющая теплица / Stainless Steel - event.shaped('8x firmalife:stainless_steel_greenhouse_wall', [ + event.recipes.gtceu.shaped('8x firmalife:stainless_steel_greenhouse_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/stainless_steel', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_wall') - event.shaped('8x firmalife:stainless_steel_greenhouse_panel_wall', [ + event.recipes.gtceu.shaped('8x firmalife:stainless_steel_greenhouse_panel_wall', [ 'ABA', 'ABA', 'ABA' ], { A: '#forge:rods/stainless_steel', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_panel_wall') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_panel_wall') - event.shaped('4x firmalife:stainless_steel_greenhouse_panel_roof', [ + event.recipes.gtceu.shaped('4x firmalife:stainless_steel_greenhouse_panel_roof', [ 'A ', 'BA ', 'BBA' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/stainless_steel' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_panel_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_panel_roof') - event.shaped('4x firmalife:stainless_steel_greenhouse_roof', [ + event.recipes.gtceu.shaped('4x firmalife:stainless_steel_greenhouse_roof', [ 'A ', 'BA ', 'BBA' ], { A: '#forge:rods/stainless_steel', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_roof') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_roof') // Верхушка крыши - event.shaped('8x firmalife:stainless_steel_greenhouse_roof_top', [ + event.recipes.gtceu.shaped('8x firmalife:stainless_steel_greenhouse_roof_top', [ 'ABA', 'BAB' ], { A: '#forge:rods/stainless_steel', B: 'firmalife:reinforced_glass' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_roof_top') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_roof_top') // Люк - event.shaped('8x firmalife:stainless_steel_greenhouse_trapdoor', [ + event.recipes.gtceu.shaped('8x firmalife:stainless_steel_greenhouse_trapdoor', [ 'ABA', 'BAB' ], { A: 'firmalife:reinforced_glass', B: '#forge:rods/stainless_steel' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_trapdoor') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_trapdoor') // Дверь - event.shaped('2x firmalife:stainless_steel_greenhouse_door', [ + event.recipes.gtceu.shaped('2x firmalife:stainless_steel_greenhouse_door', [ 'AB', 'AB', 'AB' ], { A: '#forge:rods/stainless_steel', B: 'minecraft:glass' - }).id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_door') + }).addMaterialInfo().id('firmalife:crafting/greenhouse/stainless_steel_greenhouse_door') event.shapeless('firmalife:stainless_steel_greenhouse_port', [ 'firmalife:stainless_steel_greenhouse_wall', @@ -432,7 +433,7 @@ const registerFirmaLifeRecipes = (event) => { //#endregion - event.shaped('firmalife:sweeper', [ + event.recipes.gtceu.shaped('firmalife:sweeper', [ 'ABD', 'CB ' ], { @@ -440,9 +441,9 @@ const registerFirmaLifeRecipes = (event) => { B: '#forge:rods/steel', C: 'vintageimprovements:redstone_module', D: '#forge:tools/wrenches' - }).id('firmalife:crafting/sweeper') + }).addMaterialInfo().id('firmalife:crafting/sweeper') - event.shaped('firmalife:picker', [ + event.recipes.gtceu.shaped('firmalife:picker', [ 'ABD', 'CC ', 'EE ' @@ -452,7 +453,7 @@ const registerFirmaLifeRecipes = (event) => { C: '#forge:rods/steel', D: '#forge:tools/wrenches', E: '#forge:hoe_heads/steel' - }).id('firmalife:crafting/picker') + }).addMaterialInfo().id('firmalife:crafting/picker') //#endregion diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index 316a88d85..469ff20a3 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -60,24 +60,28 @@ function registerGreateRecipes(event) { .itemOutputs('9x greate:steel_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.recipes.gtceu.cutter('aluminium_shaft') .itemInputs('#forge:plates/aluminium') .itemOutputs('9x greate:aluminium_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.recipes.gtceu.cutter('stainless_steel_shaft') .itemInputs('#forge:plates/stainless_steel') .itemOutputs('9x greate:stainless_steel_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) event.recipes.gtceu.cutter('titanium_shaft') .itemInputs('#forge:plates/titanium') .itemOutputs('9x greate:titanium_shaft') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) // #endregion @@ -89,6 +93,10 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_gearbox', { 'wood': 1, 'wrought_iron': 1 }); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1 }); event.recipes.gtceu.assembler('greate:steel_gearbox') .itemInputs('create:andesite_casing', '4x greate:steel_shaft') @@ -96,6 +104,11 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) + + TFGHelpers.registerMaterialInfo('greate:steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'steel': 4/9 }); event.recipes.gtceu.assembler('greate:aluminium_gearbox') .itemInputs('create:andesite_casing', '4x greate:aluminium_shaft') @@ -103,6 +116,11 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) + + TFGHelpers.registerMaterialInfo('greate:aluminium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:aluminium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'aluminium': 4/9 }); event.recipes.gtceu.assembler('greate:stainless_steel_gearbox') .itemInputs('create:andesite_casing', '4x greate:stainless_steel_shaft') @@ -110,6 +128,11 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) + + TFGHelpers.registerMaterialInfo('greate:stainless_steel_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'stainless_steel': 4/9 }); event.recipes.gtceu.assembler('greate:titanium_gearbox') .itemInputs('create:andesite_casing', '4x greate:titanium_shaft') @@ -117,6 +140,11 @@ function registerGreateRecipes(event) { .circuit(5) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) + + TFGHelpers.registerMaterialInfo('greate:titanium_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); + TFGHelpers.registerMaterialInfo('greate:titanium_vertical_gearbox', { 'wood': 1, 'wrought_iron': 1, 'titanium': 4/9 }); // #endregion @@ -129,6 +157,9 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_andesite_alloy_cogwheel', ['greate:andesite_alloy_cogwheel', '#forge:small_gears/wood']) .id('tfg:shapeless/large_andesite_alloy_cogwheel_upgrade'); + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_cogwheel', { 'wood': 1 }); + TFGHelpers.registerMaterialInfo('greate:large_andesite_alloy_cogwheel', { 'wood': 2 }); + event.shapeless('greate:steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron']) .id('tfg:shapeless/steel_cogwheel') event.shapeless('greate:large_steel_cogwheel', ['greate:steel_shaft', '#forge:small_gears/wrought_iron','#forge:small_gears/wrought_iron']) @@ -136,6 +167,9 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_steel_cogwheel', ['greate:steel_cogwheel', '#forge:small_gears/wrought_iron']) .id('tfg:shapeless/large_steel_cogwheel_upgrade'); + TFGHelpers.registerMaterialInfo('greate:steel_cogwheel', { 'wrought_iron': 1, 'steel': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:large_steel_cogwheel', { 'wrought_iron': 2, 'steel': 1/9 }); + event.shapeless('greate:aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel']) .id('tfg:shapeless/aluminium_cogwheel') event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_shaft', '#forge:small_gears/steel', '#forge:small_gears/steel']) @@ -143,6 +177,9 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_aluminium_cogwheel', ['greate:aluminium_cogwheel', '#forge:small_gears/steel']) .id('tfg:shapeless/large_aluminium_cogwheel_upgrade'); + TFGHelpers.registerMaterialInfo('greate:aluminium_cogwheel', { 'steel': 1, 'aluminium': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:large_aluminium_cogwheel', { 'steel': 2, 'aluminium': 1/9 }); + event.shapeless('greate:stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium']) .id('tfg:shapeless/stainless_steel_cogwheel') event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_shaft', '#forge:small_gears/aluminium', '#forge:small_gears/aluminium']) @@ -150,6 +187,9 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_stainless_steel_cogwheel', ['greate:stainless_steel_cogwheel', '#forge:small_gears/aluminium']) .id('tfg:shapeless/large_stainless_steel_cogwheel_upgrade'); + TFGHelpers.registerMaterialInfo('greate:stainless_steel_cogwheel', { 'aluminium': 1, 'stainless_steel': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:large_stainless_steel_cogwheel', { 'aluminium': 2, 'stainless_steel': 1/9 }); + event.shapeless('greate:titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel']) .id('tfg:shapeless/titanium_cogwheel') event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_shaft', '#forge:small_gears/stainless_steel', '#forge:small_gears/stainless_steel']) @@ -157,6 +197,9 @@ function registerGreateRecipes(event) { event.shapeless('greate:large_titanium_cogwheel', ['greate:titanium_cogwheel', '#forge:small_gears/stainless_steel']) .id('tfg:shapeless/large_titanium_cogwheel_upgrade'); + TFGHelpers.registerMaterialInfo('greate:titanium_cogwheel', { 'stainless_steel': 1, 'titanium': 1/9 }); + TFGHelpers.registerMaterialInfo('greate:large_titanium_cogwheel', { 'stainless_steel': 2, 'titanium': 1/9 }); + // #endregion // #region Millstones @@ -197,6 +240,8 @@ function registerGreateRecipes(event) { E: '#forge:tools/saws' }).id('greate:shaped/andesite_alloy_millstone3') + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_millstone', { 'stone': 9 }); + event.shaped('greate:steel_millstone', [ 'FBF', 'DCE', @@ -216,8 +261,9 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_millstone') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) - event.shaped('greate:aluminium_millstone', [ + event.recipes.gtceu.shaped('greate:aluminium_millstone', [ 'BCB', 'FGF', 'AAA' @@ -229,7 +275,14 @@ function registerGreateRecipes(event) { G: 'gtceu:mv_machine_casing' }).id('greate:shaped/aluminium_millstone') - event.shaped('greate:stainless_steel_millstone', [ + event.recipes.gtceu.assembler('greate:aluminium_millstone') + .itemInputs('3x #forge:double_plates/vanadium_steel', '2x #gtceu:circuits/mv', '#forge:gears/steel', '2x #forge:gems/diamond', 'gtceu:mv_machine_casing') + .itemOutputs('greate:aluminium_millstone') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) + + event.recipes.gtceu.shaped('greate:stainless_steel_millstone', [ 'BCB', 'FGF', 'AAA' @@ -241,7 +294,14 @@ function registerGreateRecipes(event) { G: 'gtceu:hv_machine_casing' }).id('greate:shaped/stainless_steel_millstone') - event.shaped('greate:titanium_millstone', [ + event.recipes.gtceu.assembler('greate:stainless_steel_millstone') + .itemInputs('3x #forge:double_plates/blue_alloy', '2x #gtceu:circuits/hv', '#forge:gears/aluminium', '2x gtceu:diamond_grinding_head', 'gtceu:hv_machine_casing') + .itemOutputs('greate:stainless_steel_millstone') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) + + event.recipes.gtceu.shaped('greate:titanium_millstone', [ 'BCB', 'FGF', 'AAA' @@ -253,58 +313,77 @@ function registerGreateRecipes(event) { G: 'gtceu:ev_machine_casing' }).id('greate:shaped/titanium_millstone') + event.recipes.gtceu.assembler('greate:titanium_millstone') + .itemInputs('3x #forge:double_plates/ultimet', '2x #gtceu:circuits/ev', '#forge:gears/stainless_steel', '2x gtceu:diamond_grinding_head', 'gtceu:ev_machine_casing') + .itemOutputs('greate:titanium_millstone') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) + // #endregion // #region Crushing wheels event.recipes.createMechanicalCrafting('2x greate:steel_crushing_wheel', [ ' AAA ', - 'AABAA', + 'ADBDA', 'ABCBA', - 'AABAA', + 'ADBDA', ' AAA ' ], { A: '#forge:plates/tin_alloy', B: '#forge:storage_blocks/wrought_iron', C: 'gtceu:lv_machine_hull', + D: '#forge:gems/diamond' }).id('greate:steel_crushing_wheel') + TFGHelpers.registerMaterialInfo('greate:steel_crushing_wheel', { 'wrought_iron': 14, 'tin_alloy': 8, 'steel': 4, 'diamond': 4 }); + event.recipes.createMechanicalCrafting('2x greate:aluminium_crushing_wheel', [ ' AAA ', - 'AABAA', + 'ADBDA', 'ABCBA', - 'AABAA', + 'ADBDA', ' AAA ' ], { A: '#forge:plates/vanadium_steel', B: '#forge:storage_blocks/steel', C: 'gtceu:mv_machine_hull', + D: '#forge:gems/diamond' }).id('greate:aluminium_crushing_wheel') + TFGHelpers.registerMaterialInfo('greate:aluminium_crushing_wheel', { 'steel': 14, 'vanadium_steel': 8, 'aluminium': 4, 'diamond': 4 }); + event.recipes.createMechanicalCrafting('2x greate:stainless_steel_crushing_wheel', [ ' AAA ', - 'AABAA', + 'ADBDA', 'ABCBA', - 'AABAA', + 'ADBDA', ' AAA ' ], { A: '#forge:plates/blue_alloy', B: '#forge:storage_blocks/aluminium', C: 'gtceu:hv_machine_hull', + D: 'gtceu:diamond_grinding_head' }).id('greate:stainless_steel_crushing_wheel') + + TFGHelpers.registerMaterialInfo('greate:stainless_steel_crushing_wheel', { 'aluminium': 14, 'blue_alloy': 8, 'stainless_steel': 4, 'steel': 32, 'diamond': 20 }); event.recipes.createMechanicalCrafting('2x greate:titanium_crushing_wheel', [ ' AAA ', - 'AABAA', + 'ADBDA', 'ABCBA', - 'AABAA', + 'ADBDA', ' AAA ' ], { A: '#forge:plates/ultimet', B: '#forge:storage_blocks/stainless_steel', C: 'gtceu:ev_machine_hull', + D: 'gtceu:diamond_grinding_head' }).id('greate:titanium_crushing_wheel') + TFGHelpers.registerMaterialInfo('greate:titanium_crushing_wheel', { 'stainless_steel': 14, 'ultimet': 8, 'titanium': 4, 'steel': 32, 'diamond': 20 }); + // #endregion // #region Encased Fan @@ -327,6 +406,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_encased_fan') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:aluminium_encased_fan', [ ' A ', @@ -345,7 +425,8 @@ function registerGreateRecipes(event) { .itemInputs('greate:aluminium_shaft', '2x #gtceu:circuits/mv', 'gtceu:mv_machine_casing', 'gtceu:aluminium_rotor') .itemOutputs('greate:aluminium_encased_fan') .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:stainless_steel_encased_fan', [ ' A ', @@ -364,7 +445,8 @@ function registerGreateRecipes(event) { .itemInputs('greate:stainless_steel_shaft', '2x #gtceu:circuits/hv', 'gtceu:hv_machine_casing', 'gtceu:stainless_steel_rotor') .itemOutputs('greate:stainless_steel_encased_fan') .duration(200) - .EUt(GTValues.VA[GTValues.MV]) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:titanium_encased_fan', [ ' A ', @@ -383,7 +465,8 @@ function registerGreateRecipes(event) { .itemInputs('greate:titanium_shaft', '2x #gtceu:circuits/ev', 'gtceu:ev_machine_casing', 'gtceu:titanium_rotor') .itemOutputs('greate:titanium_encased_fan') .duration(200) - .EUt(GTValues.VA[GTValues.HV]) + .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) // #endregion @@ -407,6 +490,8 @@ function registerGreateRecipes(event) { .itemOutputs('greate:andesite_alloy_mechanical_saw') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_saw', { 'wood': 1, 'wrought_iron': 3 }); event.shaped('greate:steel_mechanical_saw', [ 'ABA', @@ -426,6 +511,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_mechanical_saw') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:aluminium_mechanical_saw', [ 'ABA', @@ -445,6 +531,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:aluminium_mechanical_saw') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) // Removed while we wait for a fix so recipes don't work without being in a Cleanroom - Important for Wafer @@ -495,6 +582,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_mechanical_pump') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:aluminium_mechanical_pump', [ ' AB', @@ -513,6 +601,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:aluminium_mechanical_pump') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:stainless_steel_mechanical_pump', [ ' AB', @@ -531,6 +620,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:stainless_steel_mechanical_pump') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:titanium_mechanical_pump', [ ' AB', @@ -549,6 +639,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:titanium_mechanical_pump') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) // #endregion @@ -641,6 +732,8 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) event.shaped('greate:aluminium_mechanical_mixer', [ 'ABA', @@ -661,6 +754,8 @@ function registerGreateRecipes(event) { .itemOutputs('greate:aluminium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) event.shaped('greate:stainless_steel_mechanical_mixer', [ 'ABA', @@ -681,6 +776,8 @@ function registerGreateRecipes(event) { .itemOutputs('greate:stainless_steel_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) event.shaped('greate:titanium_mechanical_mixer', [ 'ABA', @@ -701,6 +798,8 @@ function registerGreateRecipes(event) { .itemOutputs('greate:titanium_mechanical_mixer') .duration(200) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo() + .addMaterialInfo(true) // #endregion @@ -719,8 +818,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:steel_whisk') - .duration(GTMaterials.Steel.getMass() * 3) + .duration(GTMaterials.Steel.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:aluminium_whisk', [ 'ADC', @@ -736,8 +836,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/aluminium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:aluminium_whisk') - .duration(GTMaterials.Aluminium.getMass() * 3) + .duration(GTMaterials.Aluminium.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:stainless_steel_whisk', [ 'ADC', @@ -753,8 +854,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/stainless_steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:stainless_steel_whisk') - .duration(GTMaterials.StainlessSteel.getMass() * 3) + .duration(GTMaterials.StainlessSteel.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:titanium_whisk', [ 'ADC', @@ -770,8 +872,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/titanium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:titanium_whisk') - .duration(GTMaterials.Titanium.getMass() * 3) + .duration(GTMaterials.Titanium.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:tungsten_steel_whisk', [ 'ADC', @@ -787,8 +890,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/tungsten_steel') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:tungsten_steel_whisk') - .duration(GTMaterials.TungstenSteel.getMass() * 3) + .duration(GTMaterials.TungstenSteel.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:rhodium_plated_palladium_whisk', [ 'ADC', @@ -804,8 +908,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/rhodium_plated_palladium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:rhodium_plated_palladium_whisk') - .duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 3) + .duration(GTMaterials.RhodiumPlatedPalladium.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:naquadah_alloy_whisk', [ 'ADC', @@ -821,8 +926,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/naquadah_alloy') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:naquadah_alloy_whisk') - .duration(GTMaterials.NaquadahAlloy.getMass() * 3) + .duration(GTMaterials.NaquadahAlloy.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) event.shaped('gtceu:darmstadtium_whisk', [ 'ADC', @@ -838,8 +944,9 @@ function registerGreateRecipes(event) { .itemInputs('7x #forge:ingots/darmstadtium') .notConsumable('tfg:whisk_extruder_mold') .itemOutputs('gtceu:darmstadtium_whisk') - .duration(GTMaterials.Darmstadtium.getMass() * 3) + .duration(GTMaterials.Darmstadtium.getMass() * 7) .EUt(GTValues.VA[GTValues.MV]) + .addMaterialInfo(true) // #endregion @@ -857,6 +964,8 @@ function registerGreateRecipes(event) { E: '#minecraft:planks', F: 'greate:andesite_alloy_shaft' }).id('greate:shaped/andesite_alloy_mechanical_press') + + TFGHelpers.registerMaterialInfo('greate:andesite_alloy_mechanical_press', { 'iron': 2 }); event.shaped('greate:steel_mechanical_press', [ ' AD', @@ -876,6 +985,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:steel_mechanical_press') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:aluminium_mechanical_press', [ 'GAD', @@ -896,6 +1006,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:aluminium_mechanical_press') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:stainless_steel_mechanical_press', [ 'GAD', @@ -916,6 +1027,7 @@ function registerGreateRecipes(event) { .itemOutputs('greate:stainless_steel_mechanical_press') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) event.shaped('greate:titanium_mechanical_press', [ 'GAD', @@ -936,10 +1048,11 @@ function registerGreateRecipes(event) { .itemOutputs('greate:titanium_mechanical_press') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) + .removePreviousMaterialInfo().addMaterialInfo(true) // #endregion - event.shaped('greate:wire_coating_factory', [ + event.recipes.gtceu.shaped('greate:wire_coating_factory', [ 'ABA', 'CDC', 'ABA' @@ -948,5 +1061,5 @@ function registerGreateRecipes(event) { B: '#gtceu:circuits/iv', C: 'gtceu:iv_electric_pump', D: 'create:spout' - }).id('tfg:shaped/toms_favourite_block') + }).addMaterialInfo().id('tfg:shaped/toms_favourite_block') } diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index a42c8e9de..3bf5677d1 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -6,68 +6,6 @@ */ function registerGreateRecyclingRecipes(event) { - // #region Shafts - - // No andesite alloy shafts because those can be crafted from 4 different materials - - event.recipes.gtceu.macerator('steel_shaft') - .itemInputs('greate:steel_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 1)) - .duration(GTMaterials.Steel.getMass()) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('steel_shaft') - .itemInputs('greate:steel_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 1)) - .duration(GTMaterials.Steel.getMass()) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('aluminium_shaft') - .itemInputs('greate:aluminium_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Aluminium, 1)) - .duration(GTMaterials.Aluminium.getMass()) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('aluminium_shaft') - .itemInputs('greate:aluminium_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 1)) - .duration(GTMaterials.Aluminium.getMass()) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('stainless_steel_shaft') - .itemInputs('greate:stainless_steel_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.StainlessSteel, 1)) - .duration(GTMaterials.StainlessSteel.getMass()) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('stainless_steel_shaft') - .itemInputs('greate:stainless_steel_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.nugget, GTMaterials.StainlessSteel, 1)) - .duration(GTMaterials.StainlessSteel.getMass()) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('titanium_shaft') - .itemInputs('greate:titanium_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Titanium, 1)) - .duration(GTMaterials.Titanium.getMass()) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('titanium_shaft') - .itemInputs('greate:titanium_shaft') - .itemOutputs(ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Titanium, 1)) - .duration(GTMaterials.Titanium.getMass()) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - // #region Cogs event.recipes.tfc.extra_products_shapeless_crafting('greate:andesite_alloy_shaft', @@ -102,242 +40,6 @@ function registerGreateRecyclingRecipes(event) { // #endregion - // #region Millstones - - event.recipes.gtceu.macerator('greate:steel_millstone') - .itemInputs('greate:steel_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Stone, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)) - .duration(GTMaterials.Stone.getMass() * 4) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_millstone') - .itemInputs('greate:steel_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)) - .duration(GTMaterials.Stone.getMass() * 4) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_millstone') - .itemInputs('greate:aluminium_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)) - .duration(GTMaterials.Aluminium.getMass() * (8+6+4+2)) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_millstone') - .itemInputs('greate:aluminium_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) - .duration(GTMaterials.Aluminium.getMass() * (8+6+4)) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_millstone') - .itemInputs('greate:stainless_steel_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 5)) - .duration(GTMaterials.StainlessSteel.getMass() * (8+8+6+4+5)) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_millstone') - .itemInputs('greate:stainless_steel_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4)) - .duration(GTMaterials.StainlessSteel.getMass() * (8+8+6+4)) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_millstone') - .itemInputs('greate:titanium_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 6), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 5)) - .duration(GTMaterials.Titanium.getMass() * (8+8+6+4+5)) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_millstone') - .itemInputs('greate:titanium_millstone') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 6), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4)) - .duration(GTMaterials.Titanium.getMass() * (8+8+6+4)) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - - // #region Crushing Wheels - - event.recipes.gtceu.macerator('greate:steel_crushing_wheel') - .itemInputs('greate:steel_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 18), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.TinAlloy, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4)) - .duration(GTMaterials.TinAlloy.getMass() * 34) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_crushing_wheel') - .itemInputs('greate:steel_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 18), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.TinAlloy, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) - .duration(GTMaterials.TinAlloy.getMass() * 34) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_crushing_wheel') - .itemInputs('greate:aluminium_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 18), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4)) - .duration(GTMaterials.VanadiumSteel.getMass() * 34) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_crushing_wheel') - .itemInputs('greate:aluminium_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 18), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4)) - .duration(GTMaterials.VanadiumSteel.getMass() * 34) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_crushing_wheel') - .itemInputs('greate:stainless_steel_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 18), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 4)) - .duration(GTMaterials.BlueAlloy.getMass() * 34) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_crushing_wheel') - .itemInputs('greate:stainless_steel_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 18), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 4)) - .duration(GTMaterials.BlueAlloy.getMass() * 34) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_crushing_wheel') - .itemInputs('greate:titanium_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 18), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 4)) - .duration(GTMaterials.Ultimet.getMass() * 34) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_crushing_wheel') - .itemInputs('greate:titanium_crushing_wheel') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 18), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 4)) - .duration(GTMaterials.Ultimet.getMass() * 34) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - - // #region Encased Fan - - event.recipes.gtceu.macerator('greate:steel_encased_fan') - .itemInputs('greate:steel_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 2)) - .duration(GTMaterials.Steel.getMass() * 7) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_encased_fan') - .itemInputs('greate:steel_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 5), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 2)) - .duration(GTMaterials.Steel.getMass() * 7) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_encased_fan') - .itemInputs('greate:aluminium_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 12)) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_encased_fan') - .itemInputs('greate:aluminium_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 12)) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_encased_fan') - .itemInputs('greate:stainless_steel_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 12)) - .duration(GTMaterials.StainlessSteel.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_encased_fan') - .itemInputs('greate:stainless_steel_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 12)) - .duration(GTMaterials.StainlessSteel.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_encased_fan') - .itemInputs('greate:titanium_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 12)) - .duration(GTMaterials.Titanium.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_encased_fan') - .itemInputs('greate:titanium_encased_fan') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 12)) - .duration(GTMaterials.Titanium.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - // #region Gearbox event.recipes.tfc.extra_products_shapeless_crafting('4x greate:andesite_alloy_shaft', @@ -357,201 +59,6 @@ function registerGreateRecyclingRecipes(event) { // #endregion - // #region Mechanical Saw - - event.recipes.gtceu.macerator('greate:andesite_alloy_mechanical_saw') - .itemInputs('greate:andesite_alloy_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Wood, 1)) - .duration(GTMaterials.WroughtIron.getMass() * 7) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:andesite_alloy_mechanical_saw') - .itemInputs('greate:andesite_alloy_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 5), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ash, 1)) - .duration(GTMaterials.WroughtIron.getMass() * 7) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:steel_mechanical_saw') - .itemInputs('greate:steel_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.CobaltBrass, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 4)) - .duration(GTMaterials.CobaltBrass.getMass() * 16) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_mechanical_saw') - .itemInputs('greate:steel_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.CobaltBrass, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.AnnealedCopper, 4)) - .duration(GTMaterials.CobaltBrass.getMass() * 16) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_mechanical_saw') - .itemInputs('greate:aluminium_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Cupronickel, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 2)) - .duration(GTMaterials.VanadiumSteel.getMass() * 22) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_mechanical_saw') - .itemInputs('greate:aluminium_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 10), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Cupronickel, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.AnnealedCopper, 2)) - .duration(GTMaterials.VanadiumSteel.getMass() * 22) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_mechanical_saw') - .itemInputs('greate:stainless_steel_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 4)) - .duration(GTMaterials.Diamond.getMass() * 22) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_mechanical_saw') - .itemInputs('greate:stainless_steel_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 10), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Diamond, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 4)) - .duration(GTMaterials.Diamond.getMass() * 22) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_mechanical_saw') - .itemInputs('greate:titanium_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Kanthal, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4)) - .duration(GTMaterials.Ultimet.getMass() * 22) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_mechanical_saw') - .itemInputs('greate:titanium_mechanical_saw') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 10), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Kanthal, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4)) - .duration(GTMaterials.Ultimet.getMass() * 22) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - - // #region Mechanical Pump - - event.recipes.gtceu.macerator('greate:steel_mechanical_pump') - .itemInputs('greate:steel_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 1), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_mechanical_pump') - .itemInputs('greate:steel_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 1), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_mechanical_pump') - .itemInputs('greate:aluminium_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 1), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 1), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Aluminium, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_mechanical_pump') - .itemInputs('greate:aluminium_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Aluminium, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_mechanical_pump') - .itemInputs('greate:stainless_steel_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 1), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 1), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.StainlessSteel, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_mechanical_pump') - .itemInputs('greate:stainless_steel_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 1), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.StainlessSteel, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_mechanical_pump') - .itemInputs('greate:titanium_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 1), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Rubber, 1), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Titanium, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_mechanical_pump') - .itemInputs('greate:titanium_mechanical_pump') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 2), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 1), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Titanium, 2)) - .duration(GTMaterials.Copper.getMass() * 3) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - // #region Belts event.recipes.gtceu.macerator('greate:rubber_belt_connector') @@ -576,144 +83,4 @@ function registerGreateRecyclingRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) // #region - - // #region Mechanical Mixer - - event.recipes.gtceu.macerator('greate:steel_mechanical_mixer') - .itemInputs('greate:steel_mechanical_mixer') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 4)) - .duration(GTMaterials.WroughtIron.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_mechanical_mixer') - .itemInputs('greate:steel_mechanical_mixer') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) - .duration(GTMaterials.WroughtIron.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_mechanical_mixer') - .itemInputs('greate:aluminium_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 12)) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_mechanical_mixer') - .itemInputs('greate:aluminium_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 12)) - .duration(GTMaterials.Aluminium.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_mechanical_mixer') - .itemInputs('greate:stainless_steel_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 12)) - .duration(GTMaterials.StainlessSteel.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_mechanical_mixer') - .itemInputs('greate:stainless_steel_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 12)) - .duration(GTMaterials.StainlessSteel.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_mechanical_mixer') - .itemInputs('greate:titanium_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 12)) - .duration(GTMaterials.Titanium.getMass() * 12) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_mechanical_mixer') - .itemInputs('greate:titanium_mechanical_mixer') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 12)) - .duration(GTMaterials.Titanium.getMass() * 12) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion - - // #region Mechanical press - - event.recipes.gtceu.macerator('greate:steel_mechanical_press') - .itemInputs('greate:steel_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 2), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 20)) - .duration(GTMaterials.WroughtIron.getMass() * 4) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:steel_mechanical_press') - .itemInputs('greate:steel_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 2), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 20)) - .duration(GTMaterials.WroughtIron.getMass() * 4) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:aluminium_mechanical_press') - .itemInputs('greate:aluminium_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 9), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.VanadiumSteel, 2)) - .duration(GTMaterials.Aluminium.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:aluminium_mechanical_press') - .itemInputs('greate:aluminium_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 9), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.VanadiumSteel, 2)) - .duration(GTMaterials.Aluminium.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:stainless_steel_mechanical_press') - .itemInputs('greate:stainless_steel_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 9), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueAlloy, 2)) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:stainless_steel_mechanical_press') - .itemInputs('greate:stainless_steel_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 9), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueAlloy, 2)) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.macerator('greate:titanium_mechanical_press') - .itemInputs('greate:titanium_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 9), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ultimet, 2)) - .duration(GTMaterials.Titanium.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('greate:titanium_mechanical_press') - .itemInputs('greate:titanium_mechanical_press') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 9), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ultimet, 2)) - .duration(GTMaterials.Titanium.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // #endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 1acfc5b7c..1adb5d2e5 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -101,6 +101,13 @@ function removeGreateRecipes(event) { event.remove({ mod: 'greate', type: 'create:deploying' }); event.remove({ mod: 'greate', type: 'create:sequenced_assembly' }); event.remove({ mod: 'greate', type: 'gtceu:assembler' }); + + event.remove({ id: 'gtceu:macerator/macerate_andesite_alloy_encased_fan' }); + event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_encased_fan' }); + event.remove({ id: 'gtceu:macerator/macerate_andesite_alloy_mechanical_mixer' }); + event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_mechanical_mixer' }); + event.remove({ id: 'gtceu:macerator/macerate_andesite_alloy_mechanical_pump' }); + event.remove({ id: 'gtceu:arc_furnace/arc_andesite_alloy_mechanical_pump' }); event.remove({ id: 'greate:cutting/integration/create/cutting/runtime_generated/compat/minecraft/bamboo_planks_to_bamboo_button' }) event.remove({ id: 'greate:mixing/integration/gtceu/mixer/fire_charge' }) diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index da89da60a..78e59b039 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -433,7 +433,7 @@ function registerGTCEuMachineRecipes(event) { //#endregion //#region passthrough hatches - event.recipes.shaped('gtceu:lv_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:lv_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -442,9 +442,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_wrought_iron_gear', C: 'gtceu:lv_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_lv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_lv') - event.recipes.shaped('gtceu:mv_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:mv_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -453,9 +453,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_bronze_gear', C: 'gtceu:mv_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_mv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_mv') - event.recipes.shaped('gtceu:ev_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:ev_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -464,9 +464,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_titanium_gear', C: 'gtceu:ev_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_ev') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_ev') - event.recipes.shaped('gtceu:iv_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:iv_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -475,9 +475,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_tungsten_steel_gear', C: 'gtceu:iv_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_iv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_iv') - event.recipes.shaped('gtceu:luv_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:luv_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -486,9 +486,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_hsss_gear', C: 'gtceu:luv_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_luv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_luv') - event.recipes.shaped('gtceu:zpm_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:zpm_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -497,9 +497,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_osmiridium_gear', C: 'gtceu:zpm_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_zpm') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_zpm') - event.recipes.shaped('gtceu:uv_item_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:uv_item_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -508,9 +508,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:small_naquadah_alloy_gear', C: 'gtceu:uv_machine_hull', D: '#tfg:default_chests' - }).id('gtceu:shaped/passthrough_hatch_item_uv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_item_uv') - event.recipes.shaped('gtceu:lv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:lv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -519,9 +519,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:bronze_small_fluid_pipe', C: 'gtceu:lv_machine_hull', D: '#forge:glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_lv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_lv') - event.recipes.shaped('gtceu:mv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:mv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -530,11 +530,11 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:steel_small_fluid_pipe', C: 'gtceu:mv_machine_hull', D: '#forge:glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_mv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_mv') event.remove('gtceu:shaped/passthrough_hatch_fluid') - event.recipes.shaped('gtceu:hv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:hv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -543,9 +543,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:stainless_steel_small_fluid_pipe', C: 'gtceu:hv_machine_hull', D: 'gtceu:tempered_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_hv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_hv') - event.recipes.shaped('gtceu:ev_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:ev_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -554,9 +554,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:titanium_small_fluid_pipe', C: 'gtceu:ev_machine_hull', D: 'gtceu:tempered_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_ev') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_ev') - event.recipes.shaped('gtceu:iv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:iv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -565,9 +565,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:tungsten_steel_small_fluid_pipe', C: 'gtceu:iv_machine_hull', D: 'gtceu:laminated_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_iv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_iv') - event.recipes.shaped('gtceu:luv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:luv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -576,9 +576,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:niobium_titanium_small_fluid_pipe', C: 'gtceu:luv_machine_hull', D: 'gtceu:laminated_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_luv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_luv') - event.recipes.shaped('gtceu:zpm_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:zpm_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -587,9 +587,9 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:polybenzimidazole_small_fluid_pipe', C: 'gtceu:zpm_machine_hull', D: 'gtceu:fusion_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_zpm') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_zpm') - event.recipes.shaped('gtceu:uv_fluid_passthrough_hatch', [ + event.recipes.gtceu.shaped('gtceu:uv_fluid_passthrough_hatch', [ ' A ', 'BCB', ' D ' @@ -598,7 +598,7 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:naquadah_small_fluid_pipe', C: 'gtceu:uv_machine_hull', D: 'gtceu:fusion_glass' - }).id('gtceu:shaped/passthrough_hatch_fluid_uv') + }).addMaterialInfo().id('gtceu:shaped/passthrough_hatch_fluid_uv') //#endregion @@ -613,7 +613,7 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:ulv_machine_hull', C: 'tfc:glue', D: '#forge:tools/wrenches' - }).id('gtceu:shaped/ulv_input_bus') + }).addMaterialInfo().id('gtceu:shaped/ulv_input_bus') event.recipes.gtceu.shaped('gtceu:ulv_output_bus', [ 'CDC', @@ -624,7 +624,7 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:ulv_machine_hull', C: 'tfc:glue', D: '#forge:tools/wrenches' - }).id('gtceu:shaped/ulv_output_bus') + }).addMaterialInfo().id('gtceu:shaped/ulv_output_bus') event.recipes.gtceu.shaped('gtceu:ulv_input_hatch', [ 'CAC', @@ -635,7 +635,7 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:ulv_machine_hull', C: 'tfc:glue', D: '#forge:tools/wrenches' - }).id('gtceu:shaped/ulv_input_hatch') + }).addMaterialInfo().id('gtceu:shaped/ulv_input_hatch') event.recipes.gtceu.shaped('gtceu:ulv_output_hatch', [ 'CDC', @@ -646,7 +646,7 @@ function registerGTCEuMachineRecipes(event) { B: 'gtceu:ulv_machine_hull', C: 'tfc:glue', D: '#forge:tools/wrenches' - }).id('gtceu:shaped/ulv_output_hatch') + }).addMaterialInfo().id('gtceu:shaped/ulv_output_hatch') //#endregion @@ -675,6 +675,7 @@ function registerGTCEuMachineRecipes(event) { .EUt(GTValues.VA[GTValues.HV]) .circuit(1) .duration(400) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler('long_distance_fluid_endpoint') .itemInputs('2x #forge:large_fluid_pipes/vanadium_steel', '8x #forge:plates/polyvinyl_chloride', '2x #forge:gears/stainless_steel') @@ -683,6 +684,7 @@ function registerGTCEuMachineRecipes(event) { .EUt(GTValues.VA[GTValues.HV]) .circuit(1) .duration(400) + .addMaterialInfo(true, true) //#endregion @@ -721,6 +723,7 @@ function registerGTCEuMachineRecipes(event) { .duration(200) .EUt(16) .circuit(2) + .addMaterialInfo(true) event.recipes.gtceu.assembler(`gtceu:${material}_crate`) .itemInputs(`4x #forge:plates/${material}`, `4x #forge:rods/long/${material}`) @@ -728,34 +731,7 @@ function registerGTCEuMachineRecipes(event) { .duration(200) .EUt(16) .circuit(1) - - event.recipes.gtceu.macerator(`gtceu:${material}_drum`) - .itemInputs(`gtceu:${material}_drum`) - .itemOutputs(`6x #forge:dusts/${material}`) - .duration(456) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - - event.recipes.gtceu.macerator(`gtceu:${material}_crate`) - .itemInputs(`gtceu:${material}_crate`) - .itemOutputs(`8x #forge:dusts/${material}`) - .duration(608) - .EUt(2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - - event.recipes.gtceu.arc_furnace(`gtceu:${material}_drum`) - .itemInputs(`gtceu:${material}_drum`) - .itemOutputs(`6x #forge:ingots/${material}`) - .duration(456) - .EUt(30) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.arc_furnace(`gtceu:${material}_crate`) - .itemInputs(`gtceu:${material}_crate`) - .itemOutputs(`8x #forge:ingots/${material}`) - .duration(608) - .EUt(30) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + .addMaterialInfo(true) }) // Wooden crate diff --git a/kubejs/server_scripts/gregtech/recipes.recycling.js b/kubejs/server_scripts/gregtech/recipes.recycling.js index 76d01fad7..2e398078b 100644 --- a/kubejs/server_scripts/gregtech/recipes.recycling.js +++ b/kubejs/server_scripts/gregtech/recipes.recycling.js @@ -140,54 +140,6 @@ function registerGTCEURecyclingRecipes(event) { .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) - // Redstone lamp - - event.recipes.gtceu.macerator('gtceu:macerate_redstone_lamp') - .itemInputs('minecraft:redstone_lamp') - .itemOutputs('2x #forge:small_dusts/red_alloy', '21x #forge:tiny_dusts/glass', '4x #forge:dusts/glowstone') - .duration(GTMaterials.RedAlloy.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_redstone_lamp') - .itemInputs('minecraft:redstone_lamp') - .itemOutputs('4x #forge:nuggets/red_alloy') - .duration(GTMaterials.RedAlloy.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Dispenser - - event.recipes.gtceu.macerator('gtceu:macerate_dispenser') - .itemInputs('minecraft:dispenser') - .itemOutputs('6x #forge:dusts/stone', '1x #forge:dusts/redstone', '1x #forge:dusts/brass') - .duration(GTMaterials.Brass.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_dispenser') - .itemInputs('minecraft:dispenser') - .itemOutputs('1x #forge:ingots/brass') - .duration(GTMaterials.Brass.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - // Dropper - - event.recipes.gtceu.macerator('gtceu:macerate_dropper') - .itemInputs('minecraft:dropper') - .itemOutputs('7x #forge:dusts/stone', '1x #forge:dusts/redstone', '1x #forge:dusts/brass') - .duration(GTMaterials.Brass.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('gtceu:arc_dropper') - .itemInputs('minecraft:dropper') - .itemOutputs('1x #forge:ingots/brass') - .duration(GTMaterials.Brass.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - // Clean Foil pack event.recipes.gtceu.macerator('gtceu:macerator/recycling/clean_foil_pack') diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 4ef126872..ef5913e00 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -268,7 +268,6 @@ ServerEvents.recipes(event => { registerTFGRecipes(event) registerTFCTextileRecipes(event) registerToolBeltRecipes(event) - registerTreeTapRecipes(event) registerVintageImprovementsRecipes(event) registerWaterFlasksRecipes(event) registerWABRecipes(event) diff --git a/kubejs/server_scripts/me_requester/recipes.js b/kubejs/server_scripts/me_requester/recipes.js index 9792a5f78..5266c66d4 100644 --- a/kubejs/server_scripts/me_requester/recipes.js +++ b/kubejs/server_scripts/me_requester/recipes.js @@ -2,61 +2,63 @@ "use strict"; const registerMERequesterRecipes = (event) => { - - event.remove({ id: 'merequester:requester' }) - // ME Requester - event.recipes.gtceu.assembler('tfg:merequester/merequester') - .itemInputs( - 'expatternprovider:ex_pattern_provider', - '#expatternprovider:extended_interface', - 'megacells:mega_crafting_unit', - '4x #gtceu:circuits/luv', - '4x #forge:double_plates/titanium_tungsten_carbide', - '4x gtceu:exquisite_amethyst_gem') - .inputFluids(Fluid.of('tfg:fluix', 144*20)) - .itemOutputs('merequester:requester') - .duration(760) - .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM) + event.remove({ id: 'merequester:requester' }) - event.recipes.gtceu.assembler('tfg:merequester/merequester_moon') - .itemInputs( - 'expatternprovider:ex_pattern_provider', - '#expatternprovider:extended_interface', - 'megacells:mega_crafting_unit', - '4x #gtceu:circuits/iv', - '4x #forge:double_plates/titanium_tungsten_carbide', - '4x gtceu:exquisite_amethyst_gem') - .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144*20)) - .itemOutputs('merequester:requester') - .duration(760) - .EUt(GTValues.VA[GTValues.EV]) - .dimension('ad_astra:moon') + // ME Requester + event.recipes.gtceu.assembler('tfg:merequester/merequester') + .itemInputs( + 'expatternprovider:ex_pattern_provider', + '#expatternprovider:extended_interface', + 'megacells:mega_crafting_unit', + '4x #gtceu:circuits/luv', + '4x #forge:double_plates/titanium_tungsten_carbide', + '4x gtceu:exquisite_amethyst_gem') + .inputFluids(Fluid.of('tfg:fluix', 144 * 20)) + .itemOutputs('merequester:requester') + .duration(760) + .EUt(GTValues.VA[GTValues.IV]) + .cleanroom(CleanroomType.CLEANROOM) - // ME Requester Terminal - event.shaped('merequester:requester_terminal', [ - 'ABC', - 'DED', - 'FGF' - ], { - A: '#forge:tools/screwdrivers', - B: 'ae2:terminal', - C: '#forge:tools/mallets', - D: '#forge:rods/steel', - E: 'merequester:requester', - F: '#forge:plates/steel', - G: 'ae2:engineering_processor' - }).id('merequester:requester_terminal') + event.recipes.gtceu.assembler('tfg:merequester/merequester_moon') + .itemInputs( + 'expatternprovider:ex_pattern_provider', + '#expatternprovider:extended_interface', + 'megacells:mega_crafting_unit', + '4x #gtceu:circuits/iv', + '4x #forge:double_plates/titanium_tungsten_carbide', + '4x gtceu:exquisite_amethyst_gem') + .inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 20)) + .itemOutputs('merequester:requester') + .duration(760) + .EUt(GTValues.VA[GTValues.EV]) + .dimension('ad_astra:moon') + .addMaterialInfo(true) - event.recipes.gtceu.assembler('assembler:ae2_requester_terminal_terminal') - .itemInputs( - 'ae2:terminal', - '2x #forge:rods/steel', - 'ae2:engineering_processor', - '2x #forge:plates/steel', - 'merequester:requester') - .itemOutputs('merequester:requester_terminal') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) + // ME Requester Terminal + event.shaped('merequester:requester_terminal', [ + 'ABC', + 'DED', + 'FGF' + ], { + A: '#forge:tools/screwdrivers', + B: 'ae2:terminal', + C: '#forge:tools/mallets', + D: '#forge:rods/steel', + E: 'merequester:requester', + F: '#forge:plates/steel', + G: 'ae2:engineering_processor' + }).id('merequester:requester_terminal') + + event.recipes.gtceu.assembler('assembler:ae2_requester_terminal_terminal') + .itemInputs( + 'ae2:terminal', + '2x #forge:rods/steel', + 'ae2:engineering_processor', + '2x #forge:plates/steel', + 'merequester:requester') + .itemOutputs('merequester:requester_terminal') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) } \ No newline at end of file diff --git a/kubejs/server_scripts/measurements/recipes.js b/kubejs/server_scripts/measurements/recipes.js index 152368cd9..8b8134052 100644 --- a/kubejs/server_scripts/measurements/recipes.js +++ b/kubejs/server_scripts/measurements/recipes.js @@ -4,7 +4,7 @@ const registerMeasurementsRecipes = (event) => { event.remove({ mod: 'measurements' }) - event.shaped('1x measurements:tape_measure', [ + event.recipes.gtceu.shaped('1x measurements:tape_measure', [ 'ABD', 'BED', 'CBB' @@ -14,19 +14,5 @@ const registerMeasurementsRecipes = (event) => { C: '#forge:ingots/rubber', D: '#forge:plates/brass', E: '#forge:springs/steel' - }).id('measurements:shapeless/tape_measure') - - event.recipes.gtceu.arc_furnace('measurements:arc_furnace/recycling/tape_measure') - .itemInputs('1x measurements:tape_measure') - .itemOutputs('1x gtceu:steel_ingot', '1x create:brass_ingot', '1x gtceu:rubber_ingot') - .duration(224) - .EUt(30) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - - event.recipes.gtceu.macerator('measurements:macerator/recycling/tape_measure') - .itemInputs('1x measurements:tape_measure') - .itemOutputs('1x gtceu:steel_dust', '1x gtceu:brass_dust', '1x gtceu:rubber_dust') - .duration(224) - .EUt(7) - .category(GTRecipeCategories.MACERATOR_RECYCLING) + }).addMaterialInfo().id('measurements:shapeless/tape_measure') } \ No newline at end of file diff --git a/kubejs/server_scripts/mega_cells/recipes.js b/kubejs/server_scripts/mega_cells/recipes.js index 7f2ccf489..c6e37506f 100644 --- a/kubejs/server_scripts/mega_cells/recipes.js +++ b/kubejs/server_scripts/mega_cells/recipes.js @@ -16,6 +16,7 @@ const registerMegaCellsRecipes = (event) => { .circuit(1) .duration(960) .EUt(2048) + .addMaterialInfo(true) //printed accumulation circuit event.recipes.gtceu.forming_press('megacells:printed_accumulation_processor') @@ -82,7 +83,7 @@ const registerMegaCellsRecipes = (event) => { .EUt(GTValues.VA[GTValues.IV]) //Mega Item Cell Housing - event.shaped('megacells:mega_item_cell_housing', [ + event.recipes.gtceu.shaped('megacells:mega_item_cell_housing', [ 'ABA', 'CDC', 'BBB' @@ -91,10 +92,10 @@ const registerMegaCellsRecipes = (event) => { B: '#forge:plates/maraging_steel_300', C: '#forge:fine_wires/niobium_titanium', D: '#gtceu:circuits/iv', - }).id('tfg:crafting/mega_item_cell_housing') + }).addMaterialInfo().id('tfg:crafting/mega_item_cell_housing') //Mega Fluid Cell Housing - event.shaped('megacells:mega_fluid_cell_housing', [ + event.recipes.gtceu.shaped('megacells:mega_fluid_cell_housing', [ 'ABA', 'CDC', 'BBB' @@ -103,10 +104,10 @@ const registerMegaCellsRecipes = (event) => { B: '#forge:plates/incoloy_ma_956', C: '#forge:fine_wires/niobium_titanium', D: '#gtceu:circuits/iv', - }).id('tfg:crafting/mega_fluid_cell_housing') + }).addMaterialInfo().id('tfg:crafting/mega_fluid_cell_housing') //cell dock - event.shaped('megacells:cell_dock', [ + event.recipes.gtceu.shaped('megacells:cell_dock', [ 'ABA', 'CDC', ], { @@ -114,7 +115,7 @@ const registerMegaCellsRecipes = (event) => { B: 'ae2:engineering_processor', C: '#ae2:glass_cable', D: '#gtceu:circuits/lv', - }).id('tfg:crafting/megacells_cell_dock') + }).addMaterialInfo().id('tfg:crafting/megacells_cell_dock') //#region Storage Components diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 5c9d20b69..f00f2a93d 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -338,6 +338,7 @@ const registerMinecraftRecipes = (event) => { .itemOutputs('minecraft:redstone_lamp') .duration(50) .EUt(7) + .addMaterialInfo(true) //#endregion @@ -684,18 +685,19 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Раздатчик, dispenser event.recipes.gtceu.assembler('dispenser') - .itemInputs('7x #forge:cobblestone', 'minecraft:redstone', 'minecraft:bow') + .itemInputs('6x #forge:cobblestone', 'minecraft:redstone', 'minecraft:bow', '#forge:small_gears/brass') .circuit(1) .itemOutputs('minecraft:dispenser') .duration(100) .EUt(30) + .addMaterialInfo(true) event.shaped('minecraft:dispenser', [ 'ADA', 'ABA', 'ACA' ], { - A: '#forge:stone', + A: '#forge:cobblestone', B: 'minecraft:bow', C: 'minecraft:redstone', D: '#forge:small_gears/brass' @@ -706,18 +708,19 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Выбрасыватель, dropper event.recipes.gtceu.assembler('dropper') - .itemInputs('7x #forge:cobblestone', '2x minecraft:redstone') + .itemInputs('7x #forge:cobblestone', 'minecraft:redstone', '#forge:small_gears/brass') .circuit(2) .itemOutputs('minecraft:dropper') .duration(100) .EUt(30) + .addMaterialInfo(true) event.shaped('minecraft:dropper', [ 'AAA', 'ADA', 'ACA' ], { - A: '#forge:stone', + A: '#forge:cobblestone', C: 'minecraft:redstone', D: '#forge:small_gears/brass' }).id('gtceu:shaped/dropper') diff --git a/kubejs/server_scripts/more_red/recipes.js b/kubejs/server_scripts/more_red/recipes.js index fc767aac6..e4ac1eacf 100644 --- a/kubejs/server_scripts/more_red/recipes.js +++ b/kubejs/server_scripts/more_red/recipes.js @@ -3,274 +3,282 @@ const registerMoreRedRecipes = (event) => { - // Удаление ненужных крафтов - event.remove({ not: [ - { id: 'morered:white_network_cable' }, - { id: 'morered:orange_network_cable' }, - { id: 'morered:magenta_network_cable' }, - { id: 'morered:light_blue_network_cable' }, - { id: 'morered:yellow_network_cable' }, - { id: 'morered:lime_network_cable' }, - { id: 'morered:pink_network_cable' }, - { id: 'morered:gray_network_cable' }, - { id: 'morered:light_gray_network_cable' }, - { id: 'morered:cyan_network_cable' }, - { id: 'morered:purple_network_cable' }, - { id: 'morered:blue_network_cable' }, - { id: 'morered:brown_network_cable' }, - { id: 'morered:green_network_cable' }, - { id: 'morered:red_network_cable' }, - { id: 'morered:black_network_cable' }, - { id: 'morered:bundled_network_cable' }, - ], mod: 'morered' }) + // Удаление ненужных крафтов + event.remove({ + not: [ + { id: 'morered:white_network_cable' }, + { id: 'morered:orange_network_cable' }, + { id: 'morered:magenta_network_cable' }, + { id: 'morered:light_blue_network_cable' }, + { id: 'morered:yellow_network_cable' }, + { id: 'morered:lime_network_cable' }, + { id: 'morered:pink_network_cable' }, + { id: 'morered:gray_network_cable' }, + { id: 'morered:light_gray_network_cable' }, + { id: 'morered:cyan_network_cable' }, + { id: 'morered:purple_network_cable' }, + { id: 'morered:blue_network_cable' }, + { id: 'morered:brown_network_cable' }, + { id: 'morered:green_network_cable' }, + { id: 'morered:red_network_cable' }, + { id: 'morered:black_network_cable' }, + { id: 'morered:bundled_network_cable' }, + ], mod: 'morered' + }) - // Latch - event.recipes.gtceu.assembler('tfg/morered/latch') - .itemInputs('4x gtceu:stone_plate', '2x minecraft:redstone_torch', '2x minecraft:redstone') - .circuit(0) - .itemOutputs('morered:latch') - .duration(100) - .EUt(16) + // Latch + event.recipes.gtceu.assembler('tfg/morered/latch') + .itemInputs('4x gtceu:stone_plate', '2x minecraft:redstone_torch', '2x minecraft:redstone') + .circuit(0) + .itemOutputs('morered:latch') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Pulse Gate - event.recipes.gtceu.assembler('tfg/morered/pulse_gate') - .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'gtceu:wrought_iron_plate') - .circuit(1) - .itemOutputs('morered:pulse_gate') - .duration(100) - .EUt(16) + // Pulse Gate + event.recipes.gtceu.assembler('tfg/morered/pulse_gate') + .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'gtceu:wrought_iron_plate') + .circuit(1) + .itemOutputs('morered:pulse_gate') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Red Wire Post - event.shapeless('2x morered:redwire_post', [ - '#forge:rods/wrought_iron', - '#forge:fine_wires/red_alloy' - ]).id('tfg:crafting/red_wire_post') + // Red Wire Post + event.recipes.gtceu.shaped('2x morered:redwire_post', ['A', 'B'], { + A: '#forge:rods/wrought_iron', + B: '#forge:fine_wires/red_alloy' + }).addMaterialInfo().id('tfg:crafting/red_wire_post') - // Red Wire Post Plate - event.recipes.gtceu.assembler('tfg/morered/red_wire_post_plate') - .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'morered:redwire_post') - .circuit(2) - .itemOutputs('morered:redwire_post_plate') - .duration(100) - .EUt(16) + // Red Wire Post Plate + event.recipes.gtceu.assembler('tfg/morered/red_wire_post_plate') + .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'morered:redwire_post') + .circuit(2) + .itemOutputs('morered:redwire_post_plate') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Red Wire Post Relay Plate - event.recipes.gtceu.assembler('tfg/morered/red_wire_post_relay_plate') - .itemInputs('3x gtceu:stone_plate', '4x minecraft:redstone', 'morered:redwire_post') - .circuit(4) - .itemOutputs('morered:redwire_post_relay_plate') - .duration(100) - .EUt(16) + // Red Wire Post Relay Plate + event.recipes.gtceu.assembler('tfg/morered/red_wire_post_relay_plate') + .itemInputs('3x gtceu:stone_plate', '4x minecraft:redstone', 'morered:redwire_post') + .circuit(4) + .itemOutputs('morered:redwire_post_relay_plate') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Red Wire Post Relay Plate - event.recipes.gtceu.assembler('tfg/morered/hexidecrubrometer') - .itemInputs('8x gtceu:stone_plate', '9x minecraft:redstone', '4x minecraft:quartz') - .circuit(5) - .itemOutputs('morered:hexidecrubrometer') - .duration(100) - .EUt(16) + // Red Wire Post Relay Plate + event.recipes.gtceu.assembler('tfg/morered/hexidecrubrometer') + .itemInputs('8x gtceu:stone_plate', '9x minecraft:redstone', '4x minecraft:quartz') + .circuit(5) + .itemOutputs('morered:hexidecrubrometer') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Bundled Cable Post - event.shapeless('2x morered:bundled_cable_post', [ - '#forge:plates/wrought_iron', - 'morered:bundled_network_cable' - ]).id('tfg:crafting/bundled_cable_post') + // Bundled Cable Post + event.shapeless('2x morered:bundled_cable_post', [ + '#forge:plates/wrought_iron', + 'morered:bundled_network_cable' + ]).id('tfg:crafting/bundled_cable_post') - // Bundled Cable Post Plate - event.recipes.gtceu.assembler('tfg/morered/bundled_cable_post_plate') - .itemInputs('morered:bundled_cable_post', '3x morered:bundled_network_cable', '#forge:plates/wrought_iron') - .circuit(6) - .itemOutputs('morered:bundled_cable_relay_plate') - .duration(100) - .EUt(16) + // Bundled Cable Post Plate + event.recipes.gtceu.assembler('tfg/morered/bundled_cable_post_plate') + .itemInputs('morered:bundled_cable_post', '3x morered:bundled_network_cable', '#forge:plates/wrought_iron') + .circuit(6) + .itemOutputs('morered:bundled_cable_relay_plate') + .duration(100) + .EUt(16) + .addMaterialInfo(true) - // Red Allot Wire - event.shapeless('12x morered:red_alloy_wire', [ - '#forge:fine_wires/red_alloy', - '#forge:fine_wires/red_alloy', - '#forge:fine_wires/red_alloy' - ]).id('tfg:crafting/red_alloy_wire') + // Red Allot Wire + event.shapeless('12x morered:red_alloy_wire', [ + '#forge:fine_wires/red_alloy', + '#forge:fine_wires/red_alloy', + '#forge:fine_wires/red_alloy' + ]).id('tfg:crafting/red_alloy_wire') - // Red Wire Spool - event.shaped('morered:redwire_spool', [ - 'ABC', - 'BAB', - 'CBA' - ], { - A: 'morered:red_alloy_wire', - B: '#forge:plates/wrought_iron', - C: '#tfc:can_be_lit_on_torch' - }).id('tfg:crafting/redwire_spool') + // Red Wire Spool + event.shaped('morered:redwire_spool', [ + 'ABC', + 'BAB', + 'CBA' + ], { + A: 'morered:red_alloy_wire', + B: '#forge:plates/wrought_iron', + C: '#tfc:can_be_lit_on_torch' + }).id('tfg:crafting/redwire_spool') - // Bundled Cable Spool - event.shaped('morered:bundled_cable_spool', [ - 'ABC', - 'BAB', - 'CBA' - ], { - A: 'morered:bundled_network_cable', - B: '#forge:plates/wrought_iron', - C: '#tfc:can_be_lit_on_torch' - }).id('tfg:crafting/bundled_cable_spool') + // Bundled Cable Spool + event.shaped('morered:bundled_cable_spool', [ + 'ABC', + 'BAB', + 'CBA' + ], { + A: 'morered:bundled_network_cable', + B: '#forge:plates/wrought_iron', + C: '#tfc:can_be_lit_on_torch' + }).id('tfg:crafting/bundled_cable_spool') - // Diode - event.recipes.gtceu.assembler('tfg/morered/diode') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(7) - .itemOutputs('morered:diode') - .duration(100) - .EUt(16) + // Diode + event.recipes.gtceu.assembler('tfg/morered/diode') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(7) + .itemOutputs('morered:diode') + .duration(100) + .EUt(16) - // Not Gate - event.recipes.gtceu.assembler('tfg/morered/not_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(8) - .itemOutputs('morered:not_gate') - .duration(100) - .EUt(16) + // Not Gate + event.recipes.gtceu.assembler('tfg/morered/not_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(8) + .itemOutputs('morered:not_gate') + .duration(100) + .EUt(16) - // Nor Gate - event.recipes.gtceu.assembler('tfg/morered/nor_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(9) - .itemOutputs('morered:nor_gate') - .duration(100) - .EUt(16) + // Nor Gate + event.recipes.gtceu.assembler('tfg/morered/nor_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(9) + .itemOutputs('morered:nor_gate') + .duration(100) + .EUt(16) - // Nand Gate - event.recipes.gtceu.assembler('tfg/morered/nand_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(10) - .itemOutputs('morered:nand_gate') - .duration(100) - .EUt(16) - - // Or Gate - event.recipes.gtceu.assembler('tfg/morered/or_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(11) - .itemOutputs('morered:or_gate') - .duration(100) - .EUt(16) - - // And Gate - event.recipes.gtceu.assembler('tfg/morered/and_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(12) - .itemOutputs('morered:and_gate') - .duration(100) - .EUt(16) + // Nand Gate + event.recipes.gtceu.assembler('tfg/morered/nand_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(10) + .itemOutputs('morered:nand_gate') + .duration(100) + .EUt(16) - // XOR Gate - event.recipes.gtceu.assembler('tfg/morered/xor_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(13) - .itemOutputs('morered:xor_gate') - .duration(100) - .EUt(16) + // Or Gate + event.recipes.gtceu.assembler('tfg/morered/or_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(11) + .itemOutputs('morered:or_gate') + .duration(100) + .EUt(16) - // XNOR Gate - event.recipes.gtceu.assembler('tfg/morered/xnor_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(14) - .itemOutputs('morered:xnor_gate') - .duration(100) - .EUt(16) + // And Gate + event.recipes.gtceu.assembler('tfg/morered/and_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(12) + .itemOutputs('morered:and_gate') + .duration(100) + .EUt(16) - // Multiplexer - event.recipes.gtceu.assembler('tfg/morered/multiplexer') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(15) - .itemOutputs('morered:multiplexer') - .duration(100) - .EUt(16) + // XOR Gate + event.recipes.gtceu.assembler('tfg/morered/xor_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(13) + .itemOutputs('morered:xor_gate') + .duration(100) + .EUt(16) - // And 2 Gate - event.recipes.gtceu.assembler('tfg/morered/and_2_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(16) - .itemOutputs('morered:and_2_gate') - .duration(100) - .EUt(16) + // XNOR Gate + event.recipes.gtceu.assembler('tfg/morered/xnor_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(14) + .itemOutputs('morered:xnor_gate') + .duration(100) + .EUt(16) - // Nand 2 Gate - event.recipes.gtceu.assembler('tfg/morered/nand_2_gate') - .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') - .circuit(17) - .itemOutputs('morered:nand_2_gate') - .duration(100) - .EUt(16) + // Multiplexer + event.recipes.gtceu.assembler('tfg/morered/multiplexer') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(15) + .itemOutputs('morered:multiplexer') + .duration(100) + .EUt(16) - // Bitwise Diode - event.recipes.gtceu.assembler('tfg/morered/bitwise_diode') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(0) - .itemOutputs('morered:bitwise_diode') - .duration(100) - .EUt(16) + // And 2 Gate + event.recipes.gtceu.assembler('tfg/morered/and_2_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(16) + .itemOutputs('morered:and_2_gate') + .duration(100) + .EUt(16) - // Bitwise Not Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_not_gate') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(1) - .itemOutputs('morered:bitwise_not_gate') - .duration(100) - .EUt(16) + // Nand 2 Gate + event.recipes.gtceu.assembler('tfg/morered/nand_2_gate') + .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') + .circuit(17) + .itemOutputs('morered:nand_2_gate') + .duration(100) + .EUt(16) - // Bitwise Or Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_or_gate') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(2) - .itemOutputs('morered:bitwise_or_gate') - .duration(100) - .EUt(16) + // Bitwise Diode + event.recipes.gtceu.assembler('tfg/morered/bitwise_diode') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(0) + .itemOutputs('morered:bitwise_diode') + .duration(100) + .EUt(16) - // Bitwise And Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_and_gate') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(3) - .itemOutputs('morered:bitwise_and_gate') - .duration(100) - .EUt(16) + // Bitwise Not Gate + event.recipes.gtceu.assembler('tfg/morered/bitwise_not_gate') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(1) + .itemOutputs('morered:bitwise_not_gate') + .duration(100) + .EUt(16) - // Bitwise Xor Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_xor_gate') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(4) - .itemOutputs('morered:bitwise_xor_gate') - .duration(100) - .EUt(16) + // Bitwise Or Gate + event.recipes.gtceu.assembler('tfg/morered/bitwise_or_gate') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(2) + .itemOutputs('morered:bitwise_or_gate') + .duration(100) + .EUt(16) - // Bitwise XNOR Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_xnor_gate') - .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') - .circuit(5) - .itemOutputs('morered:bitwise_xnor_gate') - .duration(100) - .EUt(16) + // Bitwise And Gate + event.recipes.gtceu.assembler('tfg/morered/bitwise_and_gate') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(3) + .itemOutputs('morered:bitwise_and_gate') + .duration(100) + .EUt(16) - //#region Выход: Крашеные провода + // Bitwise Xor Gate + event.recipes.gtceu.assembler('tfg/morered/bitwise_xor_gate') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(4) + .itemOutputs('morered:bitwise_xor_gate') + .duration(100) + .EUt(16) - event.recipes.gtceu.chemical_bath(`tfg:morered/wire_decolor`) - .itemInputs('#morered:colored_network_cables') - .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) - .itemOutputs('morered:red_alloy_wire') - .duration(300) - .EUt(4) - .category(GTRecipeCategories.CHEM_DYES) + // Bitwise XNOR Gate + event.recipes.gtceu.assembler('tfg/morered/bitwise_xnor_gate') + .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') + .circuit(5) + .itemOutputs('morered:bitwise_xnor_gate') + .duration(100) + .EUt(16) - global.MINECRAFT_DYE_NAMES.forEach(dye => { - - event.recipes.gtceu.chemical_bath(`tfg:morered/${dye}_wire`) - .itemInputs('morered:red_alloy_wire') - .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) - .itemOutputs(`morered:${dye}_network_cable`) - .duration(300) - .EUt(4) - .category(GTRecipeCategories.CHEM_DYES) + //#region Выход: Крашеные провода - }) + event.recipes.gtceu.chemical_bath(`tfg:morered/wire_decolor`) + .itemInputs('#morered:colored_network_cables') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs('morered:red_alloy_wire') + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) - //#endregion + global.MINECRAFT_DYE_NAMES.forEach(dye => { + + event.recipes.gtceu.chemical_bath(`tfg:morered/${dye}_wire`) + .itemInputs('morered:red_alloy_wire') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) + .itemOutputs(`morered:${dye}_network_cable`) + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + + }) + + //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/sandworm/recipes.js b/kubejs/server_scripts/sandworm/recipes.js index c5cb82480..fe0b7f638 100644 --- a/kubejs/server_scripts/sandworm/recipes.js +++ b/kubejs/server_scripts/sandworm/recipes.js @@ -11,5 +11,6 @@ const registerSandwormRecipes = (event) => { .itemOutputs('sandworm_mod:thumper') .duration(200) .circuit(10) - .EUt(GTValues.VA[GTValues.EV]); + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true); } \ No newline at end of file diff --git a/kubejs/server_scripts/simplylight/recipes.js b/kubejs/server_scripts/simplylight/recipes.js index 186c841e7..2d3255a6e 100644 --- a/kubejs/server_scripts/simplylight/recipes.js +++ b/kubejs/server_scripts/simplylight/recipes.js @@ -2,160 +2,160 @@ "use strict"; const registerSimplylightRecipes = (event) => { - - // remove old recipes - global.MINECRAFT_DYE_NAMES.forEach(color => { - event.remove({ id: `simplylight:illuminant_${color}_block_on_dyed` }) - event.remove({ id: `simplylight:illuminant_${color}_block_dyed` }) - }) - event.remove({ id: `simplylight:illuminant_block_on_dyed` }) - event.remove({ id: `simplylight:illuminant_block_dyed` }) - event.remove({ id: 'simplylight:illuminant_slab' }) - event.remove({ id: 'simplylight:walllamp' }) - event.remove({ id: 'simplylight:rodlamp' }) - event.remove({ id: 'simplylight:bulb' }) - event.remove({ id: 'simplylight:edge_light' }) - event.remove({ id: 'simplylight:lamp_post' }) - event.remove({ id: 'simplylight:illuminant_block_on' }) - event.remove({ id: 'simplylight:illuminant_block' }) - // new recipes - global.MINECRAFT_DYE_NAMES.forEach(color => { + // remove old recipes + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.remove({ id: `simplylight:illuminant_${color}_block_on_dyed` }) + event.remove({ id: `simplylight:illuminant_${color}_block_dyed` }) + }) + event.remove({ id: `simplylight:illuminant_block_on_dyed` }) + event.remove({ id: `simplylight:illuminant_block_dyed` }) + event.remove({ id: 'simplylight:illuminant_slab' }) + event.remove({ id: 'simplylight:walllamp' }) + event.remove({ id: 'simplylight:rodlamp' }) + event.remove({ id: 'simplylight:bulb' }) + event.remove({ id: 'simplylight:edge_light' }) + event.remove({ id: 'simplylight:lamp_post' }) + event.remove({ id: 'simplylight:illuminant_block_on' }) + event.remove({ id: 'simplylight:illuminant_block' }) - //exeption for white lamps because who needs consistency? - if (color !== 'white') { - event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/dyeing/illuminant_${color}_block_on`) - .itemInputs('#simplylight:any_lamp_on') - .inputFluids(Fluid.of(`tfc:${color}_dye`, 25)) - .itemOutputs(`simplylight:illuminant_${color}_block_on`) - .duration(80) - .EUt(20) - .category(GTRecipeCategories.CHEM_DYES) + // new recipes + global.MINECRAFT_DYE_NAMES.forEach(color => { - event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/dyeing/illuminant_${color}_block`) - .itemInputs('#simplylight:any_lamp_off') - .inputFluids(Fluid.of(`tfc:${color}_dye`, 25)) - .itemOutputs(`simplylight:illuminant_${color}_block`) - .duration(80) - .EUt(20) - .category(GTRecipeCategories.CHEM_DYES) + //exeption for white lamps because who needs consistency? + if (color !== 'white') { + event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/dyeing/illuminant_${color}_block_on`) + .itemInputs('#simplylight:any_lamp_on') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 25)) + .itemOutputs(`simplylight:illuminant_${color}_block_on`) + .duration(80) + .EUt(20) + .category(GTRecipeCategories.CHEM_DYES) - event.recipes.tfc.barrel_sealed(1000) - .outputItem(`simplylight:illuminant_${color}_block_on`) - .inputItem(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_${color}_block_on`)) - .inputFluid(Fluid.of(`tfc:${color}_dye`, 25)) - .id(`simplylight:barrel/dyeing/illuminant_${color}_block_on`) + event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/dyeing/illuminant_${color}_block`) + .itemInputs('#simplylight:any_lamp_off') + .inputFluids(Fluid.of(`tfc:${color}_dye`, 25)) + .itemOutputs(`simplylight:illuminant_${color}_block`) + .duration(80) + .EUt(20) + .category(GTRecipeCategories.CHEM_DYES) - event.recipes.tfc.barrel_sealed(1000) - .outputItem(`simplylight:illuminant_${color}_block`) - .inputItem(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_${color}_block`)) - .inputFluid(Fluid.of(`tfc:${color}_dye`, 25)) - .id(`simplylight:barrel/dyeing/illuminant_${color}_block`) - } - }) + event.recipes.tfc.barrel_sealed(1000) + .outputItem(`simplylight:illuminant_${color}_block_on`) + .inputItem(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_${color}_block_on`)) + .inputFluid(Fluid.of(`tfc:${color}_dye`, 25)) + .id(`simplylight:barrel/dyeing/illuminant_${color}_block_on`) - event.recipes.tfc.barrel_sealed(1000) - .outputItem(`simplylight:illuminant_block_on`) - .inputItem(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_block_on`)) - .inputFluid(Fluid.of(`tfc:white_dye`, 25)) - .id(`simplylight:barrel/dyeing/illuminant_block_on`) + event.recipes.tfc.barrel_sealed(1000) + .outputItem(`simplylight:illuminant_${color}_block`) + .inputItem(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_${color}_block`)) + .inputFluid(Fluid.of(`tfc:${color}_dye`, 25)) + .id(`simplylight:barrel/dyeing/illuminant_${color}_block`) + } + }) event.recipes.tfc.barrel_sealed(1000) - .outputItem(`simplylight:illuminant_block`) - .inputItem(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_block`)) - .inputFluid(Fluid.of(`tfc:white_dye`, 25)) - .id(`simplylight:barrel/dyeing/illuminant_block`) + .outputItem(`simplylight:illuminant_block_on`) + .inputItem(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_block_on`)) + .inputFluid(Fluid.of(`tfc:white_dye`, 25)) + .id(`simplylight:barrel/dyeing/illuminant_block_on`) - event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/bleaching/illuminant_block_on`) - .itemInputs(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_block_on`)) - .inputFluids(Fluid.of('gtceu:chlorine', 72)) - .itemOutputs('simplylight:illuminant_block_on') - .duration(80) - .EUt(20) - .category(GTRecipeCategories.CHEM_DYES) + event.recipes.tfc.barrel_sealed(1000) + .outputItem(`simplylight:illuminant_block`) + .inputItem(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_block`)) + .inputFluid(Fluid.of(`tfc:white_dye`, 25)) + .id(`simplylight:barrel/dyeing/illuminant_block`) - event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/bleaching/illuminant_block`) - .itemInputs(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_block`)) - .inputFluids(Fluid.of('gtceu:chlorine', 72)) - .itemOutputs('simplylight:illuminant_block') - .duration(80) - .EUt(20) - .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/bleaching/illuminant_block_on`) + .itemInputs(Ingredient.of('#simplylight:any_lamp_on').subtract(`simplylight:illuminant_block_on`)) + .inputFluids(Fluid.of('gtceu:chlorine', 72)) + .itemOutputs('simplylight:illuminant_block_on') + .duration(80) + .EUt(20) + .category(GTRecipeCategories.CHEM_DYES) - event.shaped('6x simplylight:illuminant_slab', [ - 'AAA', - 'BBB', - ' ' - ], { - A: 'minecraft:glowstone', - B: '#forge:plates/tin_alloy' - }).id('tfg:simplylight/illuminant_slab') + event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/bleaching/illuminant_block`) + .itemInputs(Ingredient.of('#simplylight:any_lamp_off').subtract(`simplylight:illuminant_block`)) + .inputFluids(Fluid.of('gtceu:chlorine', 72)) + .itemOutputs('simplylight:illuminant_block') + .duration(80) + .EUt(20) + .category(GTRecipeCategories.CHEM_DYES) - event.shaped('4x simplylight:wall_lamp', [ - 'BB ', - 'BA ', - 'BA ' - ], { - A: 'minecraft:glowstone', - B: '#forge:plates/tin_alloy' - }).id('tfg:simplylight/wall_lamp') + event.recipes.gtceu.shaped('6x simplylight:illuminant_slab', [ + 'AAA', + 'BBB', + ' ' + ], { + A: 'minecraft:glowstone', + B: '#forge:plates/tin_alloy' + }).addMaterialInfo().id('tfg:simplylight/illuminant_slab') - event.shaped('12x simplylight:rodlamp', [ - 'ACA', - 'ABA', - 'ACA' - ], { - A: 'minecraft:glowstone', - B: '#forge:rods/tin_alloy', - C: '#forge:bolts/tin_alloy' - }).id('tfg:simplylight/rod_lamp') + event.recipes.gtceu.shaped('4x simplylight:wall_lamp', [ + 'BB ', + 'BA ', + 'BA ' + ], { + A: 'minecraft:glowstone', + B: '#forge:plates/tin_alloy' + }).addMaterialInfo().id('tfg:simplylight/wall_lamp') - event.shaped('2x simplylight:lightbulb', [ - ' A ', - 'BBB', - ' ' - ], { - A: 'minecraft:glowstone', - B: '#forge:plates/tin_alloy' - }).id('tfg:simplylight/light_bulb') + event.recipes.gtceu.shaped('12x simplylight:rodlamp', [ + 'ACA', + 'ABA', + 'ACA' + ], { + A: 'minecraft:glowstone', + B: '#forge:rods/tin_alloy', + C: '#forge:bolts/tin_alloy' + }).addMaterialInfo().id('tfg:simplylight/rod_lamp') - event.shaped('6x simplylight:edge_light', [ - 'AAA', - 'CBC', - ' ' - ], { - A: 'minecraft:glowstone', - B: '#forge:rods/tin_alloy', - C: '#forge:bolts/tin_alloy' - }).id('tfg:simplylight/edge_light') + event.recipes.gtceu.shaped('2x simplylight:lightbulb', [ + ' A ', + 'BBB', + ' ' + ], { + A: 'minecraft:glowstone', + B: '#forge:plates/tin_alloy' + }).addMaterialInfo().id('tfg:simplylight/light_bulb') - event.shaped('4x simplylight:lamp_post', [ - ' A ', - ' B ', - ' C ' - ], { - A: '#simplylight:any_lamp_on', - B: '#forge:rods/long/tin_alloy', - C: '#forge:plates/tin_alloy', - }).id('tfg:simplylight/lamp_post') + event.recipes.gtceu.shaped('6x simplylight:edge_light', [ + 'AAA', + 'CBC', + ' ' + ], { + A: 'minecraft:glowstone', + B: '#forge:rods/tin_alloy', + C: '#forge:bolts/tin_alloy' + }).addMaterialInfo().id('tfg:simplylight/edge_light') - event.shaped('8x simplylight:illuminant_block_on', [ - 'BAB', - 'ACA', - 'BAB' - ], { - A: 'minecraft:glowstone', - B: '#forge:plates/tin_alloy', - C: '#forge:fine_wires/red_alloy', - }).id('tfg:simplylight/illuminant_block_on') + event.recipes.gtceu.shaped('4x simplylight:lamp_post', [ + ' A ', + ' B ', + ' C ' + ], { + A: '#simplylight:any_lamp_on', + B: '#forge:rods/long/tin_alloy', + C: '#forge:plates/tin_alloy', + }).addMaterialInfo().id('tfg:simplylight/lamp_post') - event.shaped('8x simplylight:illuminant_block', [ - 'ABA', - 'BCB', - 'ABA' - ], { - A: 'minecraft:glowstone', - B: '#forge:plates/tin_alloy', - C: '#forge:fine_wires/red_alloy', - }).id('tfg:simplylight/illuminant_block') + event.recipes.gtceu.shaped('8x simplylight:illuminant_block_on', [ + 'BAB', + 'ACA', + 'BAB' + ], { + A: 'minecraft:glowstone', + B: '#forge:plates/tin_alloy', + C: '#forge:fine_wires/red_alloy', + }).addMaterialInfo().id('tfg:simplylight/illuminant_block_on') + + event.recipes.gtceu.shaped('8x simplylight:illuminant_block', [ + 'ABA', + 'BCB', + 'ABA' + ], { + A: 'minecraft:glowstone', + B: '#forge:plates/tin_alloy', + C: '#forge:fine_wires/red_alloy', + }).addMaterialInfo().id('tfg:simplylight/illuminant_block') } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index ba3e871f9..2ce60c45e 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -106,28 +106,14 @@ const registerTFCRecipes = (event) => { .EUt(7) // Доменная печь - event.shaped('tfc:blast_furnace', [ + event.recipes.gtceu.shaped('tfc:blast_furnace', [ 'AAA', 'ABA', 'AAA' ], { A: '#forge:double_plates/wrought_iron', B: 'tfc:crucible' - }).id('tfc:crafting/blast_furnace') - - event.recipes.gtceu.macerator('recycle_tfc_blast_furnace') - .itemInputs('tfc:blast_furnace') - .itemOutputs(ChemicalHelper.get(TagPrefix.dust, GTMaterials.WroughtIron, 16)) - .duration(GTMaterials.WroughtIron.getMass() * 16) - .EUt(GTValues.VA[GTValues.ULV]) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - - event.recipes.gtceu.arc_furnace('recycle_tfc_blast_furnace') - .itemInputs('tfc:blast_furnace') - .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.WroughtIron, 16)) - .duration(GTMaterials.WroughtIron.getMass() * 16) - .EUt(GTValues.VA[GTValues.LV]) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) + }).addMaterialInfo().id('tfc:crafting/blast_furnace') // Тыква -> Кусочки тыквы event.recipes.tfc.advanced_shapeless_crafting( diff --git a/kubejs/server_scripts/tfc_grooming_station/recipes.js b/kubejs/server_scripts/tfc_grooming_station/recipes.js index df6eca7f0..fa47f8487 100644 --- a/kubejs/server_scripts/tfc_grooming_station/recipes.js +++ b/kubejs/server_scripts/tfc_grooming_station/recipes.js @@ -3,15 +3,15 @@ const registerTFCGroomingStationRecipes = (event) => { - global.TFC_EQUIPMENT_METALS.forEach(material => { - event.shaped(`tfcgroomer:${material}_grooming_station`, [ - 'ABA', - 'AAA', - 'C C' - ], { - A: `#forge:plates/${material}`, - B: '#forge:tools/hammers', - C: 'tfc:wattle' - }).id(`tfcgroomer:${material}_grooming_station`) - }) + global.TFC_EQUIPMENT_METALS.forEach(material => { + event.recipes.gtceu.shaped(`tfcgroomer:${material}_grooming_station`, [ + 'ABA', + 'AAA', + 'C C' + ], { + A: `#forge:plates/${material}`, + B: '#forge:tools/hammers', + C: 'tfc:wattle' + }).addMaterialInfo().id(`tfcgroomer:${material}_grooming_station`) + }) } diff --git a/kubejs/server_scripts/tfg/recipes.biochem.js b/kubejs/server_scripts/tfg/recipes.biochem.js index c362ff112..58bc16287 100644 --- a/kubejs/server_scripts/tfg/recipes.biochem.js +++ b/kubejs/server_scripts/tfg/recipes.biochem.js @@ -157,7 +157,8 @@ function registerTFGBiochemRecipes(event) { .itemOutputs('tfg:casings/machine_casing_ultraviolet') .duration(8*20) .circuit(6) - .EUt(GTValues.VA[GTValues.EV]); + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true); event.recipes.gtceu.assembler('tfg:bioculture_casing') .itemInputs('gtceu:plascrete', '#forge:frames/desh') @@ -165,7 +166,8 @@ function registerTFGBiochemRecipes(event) { .itemOutputs('tfg:casings/machine_casing_bioculture') .duration(8*20) .circuit(6) - .EUt(GTValues.VA[GTValues.HV]); + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true); event.recipes.gtceu.assembler('tfg:bioculture_glass') .itemInputs('#forge:frames/desh', ChemicalHelper.get(TagPrefix.dust, GTMaterials.Iron, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Bismuth, 1)) @@ -173,9 +175,10 @@ function registerTFGBiochemRecipes(event) { .itemOutputs('tfg:casings/machine_casing_bioculture_glass') .duration(8*20) .circuit(6) - .EUt(GTValues.VA[GTValues.HV]); + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true); - event.shaped('tfg:bioreactor', [ + event.recipes.gtceu.shaped('tfg:bioreactor', [ 'CBC', 'EAF', 'CDC' @@ -186,9 +189,9 @@ function registerTFGBiochemRecipes(event) { D: 'gtceu:aluminium_single_cable', E: 'gtceu:ev_electric_pump', F: 'gtceu:ev_electric_motor', - }).id('tfg:shaped/bioreactor'); + }).addMaterialInfo().id('tfg:shaped/bioreactor'); - event.shaped('tfg:casings/bioculture_rotor_primary', [ + event.recipes.gtceu.shaped('tfg:casings/bioculture_rotor_primary', [ 'CBC', 'DBD', 'CAC' @@ -197,7 +200,7 @@ function registerTFGBiochemRecipes(event) { B: 'gtceu:tungsten_steel_rotor', C: 'gtceu:inert_machine_casing', D: ChemicalHelper.get(TagPrefix.ring, GTMaterials.StyreneButadieneRubber, 1) - }).id('tfg:shaped/bioculture_rotor_primary'); + }).addMaterialInfo().id('tfg:shaped/bioculture_rotor_primary'); event.shapeless('tfg:casings/bioculture_rotor_secondary', [ 'tfg:casings/bioculture_rotor_primary' @@ -212,7 +215,7 @@ function registerTFGBiochemRecipes(event) { ChemicalHelper.get(TagPrefix.frameGt, GTMaterials.StainlessSteel, 1) ]).id('tfg:shapeless/sample_rack'); - event.shaped('tfg:growth_monitor', [ + event.recipes.gtceu.shaped('tfg:growth_monitor', [ 'CEC', 'DBD', 'CAC' @@ -222,7 +225,7 @@ function registerTFGBiochemRecipes(event) { C: ChemicalHelper.get(TagPrefix.plateDense, GTMaterials.TungstenSteel, 1), D: '#gtceu:circuits/luv', E: '#forge:lenses/amethyst' - }).id('tfg:shaped/growth_monitor'); + }).addMaterialInfo().id('tfg:shaped/growth_monitor'); event.recipes.gtceu.assembler('tfg:casings/machine_casing_sterilizing_pipes') .itemInputs( @@ -234,7 +237,8 @@ function registerTFGBiochemRecipes(event) { .itemOutputs(Item.of('tfg:casings/machine_casing_sterilizing_pipes').withCount(2)) .duration(8*20) .circuit(6) - .EUt(GTValues.VA[GTValues.EV]); + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true); event.recipes.gtceu.assembler('tfg:single_itemstack_bus') .itemInputs( @@ -246,7 +250,8 @@ function registerTFGBiochemRecipes(event) { .duration(15*20) .circuit(6) .EUt(GTValues.VA[GTValues.IV]) - .cleanroom(CleanroomType.CLEANROOM); + .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true); event.recipes.gtceu.assembly_line('tfg:growth_chamber') .itemInputs( @@ -290,6 +295,7 @@ function registerTFGBiochemRecipes(event) { .circuit(4) .EUt(GTValues.VA[GTValues.EV]) .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true) event.shapeless('tfg:dirty_dna_syringe', [ 'tfg:filled_dna_syringe' @@ -306,7 +312,8 @@ function registerTFGBiochemRecipes(event) { .itemOutputs(Item.of('tfg:lab_equipment').withCount(4)) .duration(10*20) .EUt(GTValues.VA[GTValues.EV]) - .cleanroom(CleanroomType.CLEANROOM); + .cleanroom(CleanroomType.CLEANROOM) + .addMaterialInfo(true); event.remove({id: 'gtceu:fluid_solidifier/petri_dish_pbi'}); event.remove({id: 'gtceu:fluid_solidifier/petri_dish_ptfe'}); diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js index 463638dc8..781873af8 100644 --- a/kubejs/server_scripts/tfg/recipes.js +++ b/kubejs/server_scripts/tfg/recipes.js @@ -18,7 +18,6 @@ const registerTFGRecipes = (event) => { registerTFGFoodRecipes(event) registerTFGSpaceRecipes(event) registerTFGStoneDustRecipes(event) - registerTFGRecyclingRecipes(event) registerTFGNuclearRecipes(event) registerTFGBiochemRecipes(event) registerTFGSpaceOres(event) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d17db800e..6efcf0d46 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -809,6 +809,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(200) .circuit(4) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) //Rock-wool stuff event.recipes.gtceu.mixer('tfg:aes_mix') diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 050473c55..55a17d523 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -10,6 +10,7 @@ function registerTFGNuclearRecipes(event) { .duration(20*30) .circuit(1) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:material_holder') .itemInputs('gtceu:ev_input_bus', '4x gtceu:uranium_triplatinum_single_wire', '2x gtceu:ev_conveyor_module', '#gtceu:circuits/ev') @@ -17,6 +18,7 @@ function registerTFGNuclearRecipes(event) { .duration(20*30) .circuit(1) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:fuel_holder') .itemInputs('gtceu:ev_machine_hull', '4x gtceu:ev_robot_arm', '4x gtceu:titanium_gear', '2x #gtceu:circuits/ev') @@ -24,6 +26,7 @@ function registerTFGNuclearRecipes(event) { .duration(20*30) .circuit(1) .EUt(GTValues.VA[GTValues.LV]) + .addMaterialInfo(true) //#region Nuclear Pellet @@ -464,6 +467,7 @@ function registerTFGNuclearRecipes(event) { .circuit(6) .duration(20 * (2.5)) .EUt(GTValues.VH[GTValues.LV]) + .addMaterialInfo(true) event.recipes.gtceu.mixer('tfg:thermally_conductive_fluid') .itemInputs('7x #forge:dusts/gallium', '2x #forge:dusts/tin', '#forge:dusts/zinc') diff --git a/kubejs/server_scripts/tfg/recipes.recycling.js b/kubejs/server_scripts/tfg/recipes.recycling.js deleted file mode 100644 index a8381bcbb..000000000 --- a/kubejs/server_scripts/tfg/recipes.recycling.js +++ /dev/null @@ -1,31 +0,0 @@ -// priority: 0 -"use strict"; - -/** - * @param {Internal.RecipesEventJS} event - */ -function registerTFGRecyclingRecipes(event) { - - //Aluminium Harvest Basket - event.recipes.gtceu.macerator('tfg:macerator/recycling/aluminium_harvest_basket') - .itemInputs('tfg:aluminium_harvest_basket') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.dustTiny, GTMaterials.Steel, 1), - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.CobaltBrass, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('tfg:arc_furnace/recycling/aluminium_harvest_basket') - .itemInputs('tfg:aluminium_harvest_basket') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 2), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 1), - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.CobaltBrass, 2) - ) - .duration(GTMaterials.Aluminium.getMass() * 2) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 3ca2a9d3d..bedeb1b6a 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -318,7 +318,7 @@ function registerTFGSpaceRecipes(event) { .duration(20 * 10) .EUt(GTValues.VA[GTValues.MV]) - event.shaped('tfg:railgun_ammo_loader', [ + event.recipes.gtceu.shaped('tfg:railgun_ammo_loader', [ 'RMR', 'MBM', 'CCC' @@ -327,9 +327,9 @@ function registerTFGSpaceRecipes(event) { R: 'gtceu:mv_robot_arm', M: 'gtceu:mv_electric_motor', C: '#forge:single_cables/annealed_copper' - }).id('tfg:shaped/railgun_ammo_loader') + }).addMaterialInfo().id('tfg:shaped/railgun_ammo_loader') - event.shaped('tfg:interplanetary_logistics_monitor', [ + event.recipes.gtceu.shaped('tfg:interplanetary_logistics_monitor', [ 'CDC', 'SHE', 'WCW' @@ -340,9 +340,9 @@ function registerTFGSpaceRecipes(event) { H: 'gtceu:hv_machine_hull', E: 'gtceu:hv_emitter', W: '#forge:single_cables/silver' - }).id('tfg:shaped/interplanetary_logistics_monitor') + }).addMaterialInfo().id('tfg:shaped/interplanetary_logistics_monitor') - event.shaped('tfg:interplanetary_item_launcher', [ + event.recipes.gtceu.shaped('tfg:interplanetary_item_launcher', [ 'NSN', 'CHC', 'NEN' @@ -352,9 +352,9 @@ function registerTFGSpaceRecipes(event) { E: 'gtceu:hv_emitter', H: 'gtceu:ev_machine_hull', N: '#forge:plates/hsla_steel' - }).id('tfg:shaped/interplanetary_item_launcher') + }).addMaterialInfo().id('tfg:shaped/interplanetary_item_launcher') - event.shaped('tfg:interplanetary_item_receiver', [ + event.recipes.gtceu.shaped('tfg:interplanetary_item_receiver', [ 'CSC', 'WHW', 'CSC' @@ -363,7 +363,7 @@ function registerTFGSpaceRecipes(event) { S: 'gtceu:mv_sensor', W: '#forge:double_cables/copper', H: 'gtceu:mv_machine_hull' - }).id('tfg:shaped/interplanetary_item_receiver') + }).addMaterialInfo().id('tfg:shaped/interplanetary_item_receiver') // Mars tree tapping diff --git a/kubejs/server_scripts/tfg/recipes.supports.js b/kubejs/server_scripts/tfg/recipes.supports.js index 9076ecc0f..ddb1e88c4 100644 --- a/kubejs/server_scripts/tfg/recipes.supports.js +++ b/kubejs/server_scripts/tfg/recipes.supports.js @@ -185,29 +185,5 @@ function registerTFGSupportRecipes(event) { .itemInputs('2x #forge:double_ingots/steel') .duration(100) .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.macerator('tfg:macerator/recycling/steel_support') - .itemInputs('tfg:steel_support') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dustSmall, GTMaterials.Steel, 2) - ) - .duration(GTMaterials.Steel.getMass() * 2) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('tfg:arc_furnace/recycling/steel_support') - .itemInputs('tfg:steel_support') - .itemOutputs( - ChemicalHelper.get(TagPrefix.nugget, GTMaterials.Steel, 4) - ) - .duration(GTMaterials.Steel.getMass() * 4) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.extractor('tfg:extractor/recycling/steel_support') - .itemInputs('tfg:steel_support') - .outputFluids(Fluid.of('gtceu:steel', 64)) - .duration(GTMaterials.Steel.getMass() * 2) - .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) + .addMaterialInfo(true) } diff --git a/kubejs/server_scripts/treetap/recipes.js b/kubejs/server_scripts/treetap/recipes.js deleted file mode 100644 index 5880e5b65..000000000 --- a/kubejs/server_scripts/treetap/recipes.js +++ /dev/null @@ -1,8 +0,0 @@ -// priority: 0 -"use strict"; - -const registerTreeTapRecipes = (event) => { - - //kill this off, this mod might even be removed in the future - event.remove({ mod: 'treetap' }) -} \ No newline at end of file diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 434fa8954..787387461 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -7,7 +7,7 @@ function registerVintageImprovementsRecipes(event) { // #region Machines - event.shaped('vintageimprovements:spring_coiling_machine', [ + event.recipes.gtceu.shaped('vintageimprovements:spring_coiling_machine', [ 'CDF', 'CAF', 'EBE' @@ -18,9 +18,9 @@ function registerVintageImprovementsRecipes(event) { D: '#forge:double_ingots/black_steel', E: '#forge:small_gears/steel', F: '#gtceu:circuits/ulv' - }).id('tfg:vi/shaped/spring_coiling_machine') + }).addMaterialInfo().id('tfg:vi/shaped/spring_coiling_machine') - event.shaped('vintageimprovements:vacuum_chamber', [ + event.recipes.gtceu.shaped('vintageimprovements:vacuum_chamber', [ 'EBE', 'DAG', 'FCF' @@ -32,9 +32,9 @@ function registerVintageImprovementsRecipes(event) { E: 'create:electron_tube', F: '#forge:plates/black_steel', G: 'create:precision_mechanism' - }).id('tfg:vi/shaped/vacuum_chamber') + }).addMaterialInfo().id('tfg:vi/shaped/vacuum_chamber') - event.shaped('vintageimprovements:vibrating_table', [ + event.recipes.gtceu.shaped('vintageimprovements:vibrating_table', [ 'BCB', 'DAD', 'BEB' @@ -44,7 +44,7 @@ function registerVintageImprovementsRecipes(event) { C: '#forge:plates/black_steel', D: '#gtceu:circuits/ulv', E: 'greate:steel_cogwheel' - }).id('tfg:vi/shaped/vibrating_table') + }).addMaterialInfo().id('tfg:vi/shaped/vibrating_table') event.recipes.create.mechanical_crafting('vintageimprovements:centrifuge', [ ' A ', @@ -62,7 +62,9 @@ function registerVintageImprovementsRecipes(event) { E: 'greate:steel_cogwheel' }).id('tfg:vi/mechanical_crafting/centrifuge') - event.shaped('vintageimprovements:curving_press', [ + TFGHelpers.registerMaterialInfo('vintageimprovements:centrifuge', { 'black_steel': 1, 'wrought_iron': 3 }); + + event.recipes.gtceu.shaped('vintageimprovements:curving_press', [ 'DBD', 'FAF', 'CEC' @@ -73,7 +75,7 @@ function registerVintageImprovementsRecipes(event) { D: '#gtceu:circuits/ulv', E: '#forge:plates/black_steel', F: '#forge:springs/wrought_iron' - }).id('tfg:vi/shaped/curving_press') + }).addMaterialInfo().id('tfg:vi/shaped/curving_press') event.shapeless('vintageimprovements:curving_press', ['create:mechanical_press', '#forge:tools/files']) .id('tfg:shapeless/mech_press_converting') @@ -91,6 +93,8 @@ function registerVintageImprovementsRecipes(event) { F: '#forge:tools/hammers' }).id('tfg:vi/shaped/helve_hammer') + TFGHelpers.registerMaterialInfo('vintageimprovements:helve_hammer', { 'iron': 2 }); + event.shaped('vintageimprovements:grinder_belt', [ 'AAA', 'CBC' @@ -100,7 +104,7 @@ function registerVintageImprovementsRecipes(event) { C: 'tfc:glue' }).id('tfg:vi/shaped/grinder_belt') - event.shaped('vintageimprovements:belt_grinder', [ + event.recipes.gtceu.shaped('vintageimprovements:belt_grinder', [ 'GBG', 'EAF', 'DCD' @@ -112,7 +116,7 @@ function registerVintageImprovementsRecipes(event) { E: 'create:precision_mechanism', F: 'minecraft:diamond', G: '#forge:rods/black_steel' - }).id('tfg:vi/shaped/belt_grinder') + }).addMaterialInfo().id('tfg:vi/shaped/belt_grinder') // #endregion @@ -132,6 +136,7 @@ function registerVintageImprovementsRecipes(event) { .itemOutputs('vintageimprovements:redstone_module') .duration(20 * 20) .EUt(20) + .addMaterialInfo(true) event.shaped('vintageimprovements:helve_hammer_slot_cover', [ 'B B',