diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 67bb97cf7..aa064cd13 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -2171,7 +2171,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { // Chemical Reactor event.recipes.gtceu.chemical_reactor('ae2:fluix_pearl') - .itemInputs('4x #forge:gems/fluix', '#forge:gems/ender_eye') + .itemInputs('4x #forge:gems/fluix', 'tfg:vitrified_pearl') .inputFluids(Fluid.of('tfg:fluix', 576)) .itemOutputs('ae2:fluix_pearl') .duration(200) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 4a7c721e8..6f546b2fa 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -613,8 +613,6 @@ function registerTFGMiscellaneousRecipes(event) { // Not-ender pearl stuff - event.replaceInput({ mod: 'gtceu' }, 'minecraft:ender_eye', 'tfg:vitrified_pearl') - event.recipes.gtceu.chemical_reactor('kaolinite') .itemInputs('5x #tfg:aluminium_oxide', '2x #forge:dusts/silicon') .inputFluids(Fluid.of('gtceu:distilled_water', 18000), Fluid.of('gtceu:chlorine', 8000)) @@ -664,4 +662,66 @@ function registerTFGMiscellaneousRecipes(event) { .itemOutputs('#forge:dusts/vitrified_pearl') .duration(40) .EUt(GTValues.VA[GTValues.ULV]) + + // Have to redo all these because .replaceInput doesn't work for some reason!! + + event.shaped('gtceu:mv_field_generator', [ + 'ABA', + 'CDC', + 'ABA' + ], { + A: '#forge:quadruple_wires/magnesium_diboride', + B: '#forge:plates/aluminium', + C: '#gtceu:circuits/mv', + D: 'tfg:vitrified_pearl' + }).id('gtceu:shaped/field_generator_mv') + + event.recipes.gtceu.assembler('field_generator_mv') + .itemInputs('tfg:vitrified_pearl', '2x #forge:plates/aluminium', '2x #gtceu:circuits/mv', '4x #forge:quadruple_wires/magnesium_diboride') + .itemOutputs('gtceu:mv_field_generator') + .duration(100) + .EUt(30) + + event.shaped('gtceu:hv_emitter', [ + 'ABC', + 'BDB', + 'CBA' + ], { + A: '#forge:single_cables/gold', + B: '#forge:rods/chromium', + C: '#gtceu:circuits/hv', + D: 'tfg:vitrified_pearl' + }).id('gtceu:shaped/emitter_hv') + + event.recipes.gtceu.assembler('emitter_hv') + .itemInputs('tfg:vitrified_pearl', '4x #forge:rods/chromium', '2x #gtceu:circuits/hv', '2x #forge:single_cables/gold') + .itemOutputs('gtceu:hv_emitter') + .circuit(1) + .duration(100) + .EUt(30) + + event.shaped('gtceu:hv_sensor', [ + 'A B', + 'AC ', + 'DAA' + ], { + A: '#forge:plates/stainless_steel', + B: 'tfg:vitrified_pearl', + C: '#forge:rods/chromium', + D: '#gtceu:circuits/hv', + }).id('gtceu:shaped/sensor_hv') + + event.recipes.gtceu.assembler('sensor_hv') + .itemInputs('tfg:vitrified_pearl', '#forge:rods/chromium', '#gtceu:circuits/hv', '4x #forge:plates/stainless_steel') + .itemOutputs('gtceu:hv_sensor') + .duration(100) + .EUt(30) + + // Temporary + event.recipes.gtceu.chemical_bath('quantum_eye') + .itemInputs('tfg:vitrified_pearl') + .inputFluids(Fluid.of('gtceu:radon', 250)) + .itemOutputs('gtceu:quantum_eye') + .duration(24 * 20) + .EUt(480) } diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index a8df502cd..dcf656633 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -180,7 +180,7 @@ function registerTFGTerrariumRecipes(event) { 'B', 'C' ], { - A: 'minecraft:ender_eye', + A: 'tfg:vitrified_pearl', B: 'minecraft:cyan_carpet', C: 'minecraft:end_stone' }).id('tfg:shaped/artificial_end_portal_frame') diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index fe9d555b6..32dceb6a0 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -140,6 +140,11 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:lv_damascus_steel_screwdriver', 'gtceu:damascus_steel_bucket', + // Huh + 'gtceu:wax_dust', + 'gtceu:small_wax_dust', + 'gtceu:tiny_wax_dust', + // Sculk 'gtceu:tiny_echo_shard_dust', 'gtceu:small_echo_shard_dust', @@ -151,9 +156,9 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:echo_shard_plate', 'gtceu:echo_shard_rod', 'gtceu:echo_shard_block', - 'gtceu:tiny_skulk_dust', - 'gtceu:small_skulk_dust', - 'gtceu:skulk_dust', + 'gtceu:tiny_sculk_dust', + 'gtceu:small_sculk_dust', + 'gtceu:sculk_dust', // Ender eye 'gtceu:ender_eye_plate',