diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index a2db1b5e3..db97646b5 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1905,18 +1905,11 @@ id: "707596E5E9F01B8A" optional: true subtitle: "{quests.high_voltage.alumina_board.subtitle}" - tasks: [ - { - id: "3C7B8FD59C034269" - item: "tfg:chromium_bonded_beo_pcb" - type: "item" - } - { - id: "32FDC591ACE9B2CF" - item: "tfg:copper_bonded_al2o3_pcb" - type: "item" - } - ] + tasks: [{ + id: "32FDC591ACE9B2CF" + item: "tfg:copper_bonded_al2o3_pcb" + type: "item" + }] x: -2.5d y: 3.0d } diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index d4a73f7e4..01a34d38b 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -2329,4 +2329,9 @@ const registerAE2Recipes = (event) => { E: 'ae2:silicon_press' }).id('tfg:shaped/not_so_mysterious_cube') + event.recipes.gtceu.macerator('sky_stone') + .itemInputs('#tfg:stone_types/suevite') + .itemOutputs('ae2:sky_dust') + .EUt(2) + .duration(100) } diff --git a/kubejs/server_scripts/tfg/hv_rework/material.recipes.js b/kubejs/server_scripts/tfg/hv_rework/material.recipes.js index b9be3a78b..9fde99b8d 100644 --- a/kubejs/server_scripts/tfg/hv_rework/material.recipes.js +++ b/kubejs/server_scripts/tfg/hv_rework/material.recipes.js @@ -105,7 +105,7 @@ function registerTFGHVMaterialRecipes(event) { .itemInputs(Item.of('tfg:igneous_felsic_dust', 1)) .inputFluids(Fluid.of('gtceu:sulfuric_acid', 1000)) .itemOutputs(Item.of('tfg:aluminium_sulfate_dust', 1), Item.of('gtceu:potassium_sulfate_dust', 1), Item.of('gtceu:silicon_dioxide_dust')) - .outputFluids(Fluid.of('water', 1000)) + .outputFluids(Fluid.of('minecraft:water', 1000), Fluid.of('gtceu:diluted_sulfuric_acid', 1000)) .duration(20 * 84) .EUt(GTValues.VA[GTValues.LV]) .circuit(2) diff --git a/kubejs/server_scripts/tfg/machines/recipes.circuit_board.js b/kubejs/server_scripts/tfg/machines/recipes.circuit_board.js index a15b9ca77..c1a85435d 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.circuit_board.js +++ b/kubejs/server_scripts/tfg/machines/recipes.circuit_board.js @@ -102,66 +102,65 @@ function registerTFGCircuitBoardsRecipes(event) { // Printed Circuit boards - const FLUID_REPLACEMENTS = { + const FLUID_REPLACEMENTS = [ // Minimal T4 - EV - "advanced_circuit_board_persulfate": { - input: "gtceu:sodium_persulfate", - replacement: "gtceu:iron_iii_chloride" + { + recipe: "advanced_circuit_board_persulfate", + old: "gtceu:sodium_persulfate", + new: "gtceu:iron_iii_chloride" }, // Best T4 - EV - "advanced_circuit_board_iron3": { - input: "gtceu:iron_iii_chloride", - replacement: "tfg:redstone_tri_p_toluenesulfonate" + { + recipe: "advanced_circuit_board_iron3", + old: "gtceu:iron_iii_chloride", + new: "tfg:redstone_tri_p_toluenesulfonate" }, // Minimal T5 - IV - "extreme_circuit_board_persulfate": { - input: "gtceu:sodium_persulfate", - replacement: "tfg:redstone_tri_p_toluenesulfonate" + { + recipe: "extreme_circuit_board_persulfate", + old: "gtceu:sodium_persulfate", + new: "tfg:redstone_tri_p_toluenesulfonate" }, // Best T5 - IV - "extreme_circuit_board_iron3": { - input: "gtceu:iron_iii_chloride", - replacement: undefined + { + recipe: "extreme_circuit_board_iron3", + old: "gtceu:iron_iii_chloride", + new: undefined }, // Minimal T6 - LuV - "elite_circuit_board_persulfate": { - input: "gtceu:sodium_persulfate", - replacement: "tfg:redstone_tri_p_toluenesulfonate" // Redstone Etching + { + recipe: "elite_circuit_board_persulfate", + old: "gtceu:sodium_persulfate", + new: "tfg:redstone_tri_p_toluenesulfonate" // Redstone Etching }, // Best T6 - LuV - "elite_circuit_board_iron3": { - input: "gtceu:iron_iii_chloride", - replacement: undefined // New when Venus is Out + { + recipe: "elite_circuit_board_iron3", + old: "gtceu:iron_iii_chloride", + new: undefined // New when Venus is Out }, // Minimal T7 - ZPM - "wetware_circuit_board_persulfate": { - input: "gtceu:sodium_persulfate", - replacement: "tfg:redstone_tri_p_toluenesulfonate" // New when Venus is Out + { + recipe: "wetware_circuit_board_persulfate", + old: "gtceu:sodium_persulfate", + new: "tfg:redstone_tri_p_toluenesulfonate" // New when Venus is Out }, // Best T7 - ZPM - "wetware_circuit_board_iron3": { - input: "gtceu:iron_iii_chloride", - replacement: undefined // New when ZPM Planet is Out + { + recipe: "wetware_circuit_board_iron3", + old: "gtceu:iron_iii_chloride", + new: undefined // New when ZPM Planet is Out }, - } - - const REACTOR_PREFIXES = [ - "gtceu:chemical_reactor", - "gtceu:large_chemical_reactor" ] - Object.keys(FLUID_REPLACEMENTS).forEach(recipeName => { - const { input, replacement } = FLUID_REPLACEMENTS[recipeName] - - REACTOR_PREFIXES.forEach(prefix => { - const recipeId = `${prefix}/${recipeName}` - - if (replacement) { - event.replaceInput({ id: recipeId }, Fluid.of(input), Fluid.of(replacement)) - } else { - event.remove({ id: recipeId }) - } - }) + FLUID_REPLACEMENTS.forEach(replacement => { + if (replacement.new !== undefined) { + event.replaceInput({ id: `gtceu:chemical_reactor/${replacement.recipe}` }, Fluid.of(replacement.old), Fluid.of(replacement.new)) + event.replaceInput({ id: `gtceu:large_chemical_reactor/${replacement.recipe}` }, Fluid.of(replacement.old), Fluid.of(replacement.new)) + } else { + event.remove({ id: `gtceu:chemical_reactor/${replacement.recipe}` }) + event.remove({ id: `gtceu:large_chemical_reactor/${replacement.recipe}` }) + } }) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.coils.js b/kubejs/server_scripts/tfg/machines/recipes.coils.js index 3dff18619..ff37c5776 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.coils.js +++ b/kubejs/server_scripts/tfg/machines/recipes.coils.js @@ -100,28 +100,28 @@ function registerTFGCoilRecipes(event) { TFGHelpers.registerMaterialInfo('tfg:blue_alloy_desh_foil', [GTMaterials.BlueAlloy, 0.5, GTMaterials.get('gtceu:desh'), 0.25]) event.recipes.gtceu.implosion_compressor('tfg:chorus_ceramic_insulation_dynamite') - .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', '2x gtceu:dynamite') + .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', 'ae2:fluix_dust', '2x gtceu:dynamite') .itemOutputs('tfg:chorus_ceramic_insulation') .chancedOutput('#forge:dusts/dark_ash', 2500, 0) .duration(20) .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.implosion_compressor('tfg:chorus_ceramic_insulation_powderbarrel') - .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', '8x gtceu:powderbarrel') + .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', 'ae2:fluix_dust', '8x gtceu:powderbarrel') .itemOutputs('tfg:chorus_ceramic_insulation') .chancedOutput('#forge:dusts/dark_ash', 2500, 0) .duration(20) .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.implosion_compressor('tfg:chorus_ceramic_insulation_tnt') - .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', '4x minecraft:tnt') + .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', 'ae2:fluix_dust', '4x minecraft:tnt') .itemOutputs('tfg:chorus_ceramic_insulation') .chancedOutput('#forge:dusts/dark_ash', 2500, 0) .duration(20) .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.implosion_compressor('tfg:chorus_ceramic_insulation_itnt') - .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', 'gtceu:industrial_tnt') + .itemInputs('ae2:sky_dust', '#forge:dusts/perlite', '#forge:dusts/kaolinite', 'minecraft:popped_chorus_fruit', 'ae2:fluix_dust', 'gtceu:industrial_tnt') .itemOutputs('tfg:chorus_ceramic_insulation') .chancedOutput('#forge:dusts/dark_ash', 2500, 0) .duration(20) diff --git a/kubejs/server_scripts/tfg/mv_rework/material.recipes.js b/kubejs/server_scripts/tfg/mv_rework/material.recipes.js index c91f2e8f1..595f471cc 100644 --- a/kubejs/server_scripts/tfg/mv_rework/material.recipes.js +++ b/kubejs/server_scripts/tfg/mv_rework/material.recipes.js @@ -34,6 +34,7 @@ function registerTFGMVMaterialRecipes(event) { .itemInputs(Item.of('tfg:rough_silicon_carbide_dust',1)) .inputFluids(Fluid.of('gtceu:hydrochloric_acid', 1000)) .itemOutputs(Item.of('tfg:silicon_carbide_ingot', 1)) + .outputFluids(Fluid.of('gtceu:diluted_hydrochloric_acid', 1000)) .duration(20*16) .EUt(GTValues.VA[GTValues.MV])