From 8fae20f5567cda063d2f97ece96fa2e980207497 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 3 May 2025 22:46:46 +0100 Subject: [PATCH] - the other ae2 wireless terminals are now all in late EV - MEGA ae2 stuff now requires naq instead of a singularity --- kubejs/server_scripts/ae2/recipes.js | 12 ++-- kubejs/server_scripts/ae2wtlib/recipes.js | 80 ++++++++++++++++----- kubejs/server_scripts/mega_cells/recipes.js | 17 ++--- kubejs/startup_scripts/gtceu/materials.js | 3 + 4 files changed, 75 insertions(+), 37 deletions(-) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index c120022b8..5b0e08156 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -830,15 +830,15 @@ const registerAE2Recipes = (event) => { // Wireless Crafting Terminal event.recipes.gtceu.assembler('ae2:wireless_crafting_terminal') .itemInputs( - '2x gtceu:hv_lithium_battery', - '2x gtceu:luv_sensor', - 'gtceu:luv_emitter', - '2x #forge:rods/osmiridium', + '2x #gtceu:batteries/ev', + '2x gtceu:ev_sensor', + 'gtceu:ev_emitter', + '2x #forge:rods/ultimet', 'ae2:wireless_terminal', 'ae2:crafting_terminal') .itemOutputs('ae2:wireless_crafting_terminal') - .duration(30) - .EUt(250) + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) //#region Storage Components diff --git a/kubejs/server_scripts/ae2wtlib/recipes.js b/kubejs/server_scripts/ae2wtlib/recipes.js index 848b81e53..bc38b740c 100644 --- a/kubejs/server_scripts/ae2wtlib/recipes.js +++ b/kubejs/server_scripts/ae2wtlib/recipes.js @@ -13,30 +13,28 @@ const registerAE2WTLibRecipes = (event) => { // Wireless Pattern Terminal event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_encoding_terminal') .itemInputs( - '2x gtceu:hv_lithium_battery', + '2x #gtceu:batteries/ev', 'ae2:wireless_terminal', 'ae2:pattern_encoding_terminal', - '2x gtceu:luv_sensor', - 'gtceu:luv_emitter', - '2x #forge:rods/osmiridium', - ) + '2x gtceu:ev_sensor', + 'gtceu:ev_emitter', + '2x #forge:rods/ultimet') .itemOutputs('ae2wtlib:wireless_pattern_encoding_terminal') - .duration(30) - .EUt(250) + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) // Pattern Access Terminal event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_access_terminal') .itemInputs( - '2x gtceu:hv_lithium_battery', + '2x #gtceu:batteries/ev', 'ae2:wireless_terminal', 'ae2:pattern_access_terminal', - '2x gtceu:luv_sensor', - 'gtceu:luv_emitter', - '2x #forge:rods/osmiridium' - ) + '2x gtceu:ev_sensor', + 'gtceu:ev_emitter', + '2x #forge:rods/ultimet') .itemOutputs('ae2wtlib:wireless_pattern_access_terminal') - .duration(30) - .EUt(250) + .duration(300) + .EUt(GTValues.VA[GTValues.EV]) // Magnet Card event.recipes.gtceu.assembler('ae2wtlib:magnet_card') @@ -44,12 +42,9 @@ const registerAE2WTLibRecipes = (event) => { '#forge:ingots/magnetic_neodymium', '4x #forge:rods/magnetic_neodymium', 'ae2:advanced_card', - 'ae2:annihilation_plane', - '#forge:plates/redstone', - '#forge:plates/lapis', - ) + 'ae2:annihilation_plane') .itemOutputs('ae2wtlib:magnet_card') - .duration(30) + .duration(300) .EUt(250) // Quantum Bridge Card @@ -70,4 +65,51 @@ const registerAE2WTLibRecipes = (event) => { .itemOutputs('ae2wtlib:quantum_bridge_card') .duration(300) .EUt(64000) + + + //event.remove({ output: 'ae2wtlib:wireless_universal_terminal' }) + + //event.shaped('ae2wtlib:wireless_universal_terminal', [ + // 'DED', + // 'ABC', + // 'DFD' + //], { + // A: 'ae2:wireless_crafting_terminal', + // B: 'ae2wtlib:wireless_pattern_encoding_terminal', + // C: 'ae2wtlib:wireless_pattern_access_terminal', + // D: '#forge:plates/rhodium', + // E: 'gtceu:iv_sensor', + // F: 'gtceu:iv_emitter' + //}) + //.modifyResult((craftingGrid, result) => { + // try { + // result.nbt.putInt("crafting", 1); + // result.nbt.putInt("pattern_access", 1); + // result.nbt.putInt("pattern_encoding", 1); + // } + // catch (exception) { + // console.log(exception) + // } + // return result; + //}) + //.id('tfg:shaped/wireless_universal_terminal') + + //event.recipes.gtceu.assembler('ae2wtlib:wireless_universal_terminal') + // .itemInputs( + // 'ae2:wireless_crafting_terminal', + // 'ae2wtlib:wireless_pattern_encoding_terminal', + // 'ae2wtlib:wireless_pattern_access_terminal', + // '#gtceu:batteries/iv', + // '1x gtceu:iv_sensor', + // '1x gtceu:iv_emitter', + // '2x #forge:rods/tungsten_carbide') + // .itemOutputs('ae2wtlib:wireless_universal_terminal') + // .duration(300) + // .EUt(GTValues.VA[GTValues.IV]) + // .modifyResult((craftingGrid, result) => { + // result.nbt.putInt("crafting", 1); + // result.nbt.putInt("pattern_access", 1); + // result.nbt.putInt("pattern_encoding", 1); + // return result; + // }) } \ 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 ba3a93c66..36ef469f5 100644 --- a/kubejs/server_scripts/mega_cells/recipes.js +++ b/kubejs/server_scripts/mega_cells/recipes.js @@ -18,22 +18,15 @@ const registerMegaCellsRecipes = (event) => { //printed accumulation circuit event.recipes.gtceu.forming_press('megacells:printed_accumulation_processor') - .itemInputs('#forge:plates/enriched_naquadah') + .itemInputs('#forge:dense_plates/silicon') .notConsumable('megacells:accumulation_processor_press') .itemOutputs('megacells:printed_accumulation_processor') .duration(20) .EUt(1920) - // Inscrdiber Silicon Press - event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_iron') - .itemInputs('#forge:plates/cast_iron', 'ae2:singularity') - .notConsumable('#forge:lenses/black') - .itemOutputs('megacells:accumulation_processor_press') - .duration(6000) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press_wrought_iron') - .itemInputs('#forge:plates/wrought_iron', 'ae2:singularity') + // Inscriber Silicon Press + event.recipes.gtceu.laser_engraver('ae2:accumulation_processor_press') + .itemInputs('#forge:plates/naquadah') .notConsumable('#forge:lenses/black') .itemOutputs('megacells:accumulation_processor_press') .duration(4000) @@ -73,7 +66,7 @@ const registerMegaCellsRecipes = (event) => { 'BBB' ], { A: 'ae2:quartz_vibrant_glass', - B: '#forge:plates/enriched_naquadah', + B: '#forge:plates/maraging_steel_300', C: '#forge:fine_wires/niobium_titanium', D: '#gtceu:circuits/iv', }).id('tfg:crafting/mega_item_cell_housing') diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 5deb267fd..68cf32119 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -36,6 +36,7 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_GEAR, GENERATE_FRAME, GENERATE_PLATE, + GENERATE_DENSE, GENERATE_RING } = $MATERIAL_FLAGS @@ -208,6 +209,8 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.SterlingSilver.addFlags(GENERATE_RING); GTMaterials.IronMagnetic.addFlags(GENERATE_PLATE) + + GTMaterials.Silicon.addFlags(GENERATE_DENSE); GTMaterials.TreatedWood.addFlags(GENERATE_LONG_ROD);