diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 090118219..0afc4979a 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -245,13 +245,37 @@ const registerAdAstraRecipes = (event) => { E: '#gtceu:circuits/mv' }).id('tfg:oxygen_sensor') - event.shaped('ad_astra:solar_panel', [ + event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_silicon') + .itemInputs('gtceu:silicon_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') + .itemOutputs('ad_astra:photovoltaic_etrium_cell') + .EUt(GTValues.VA[GTValues.MV]) + .duration(100) + + event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_phosphorous') + .itemInputs('gtceu:phosphorus_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') + .itemOutputs('2x ad_astra:photovoltaic_etrium_cell') + .EUt(GTValues.VA[GTValues.MV]) + .duration(100) + + event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_naquadah') + .itemInputs('gtceu:naquadah_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') + .itemOutputs('4x ad_astra:photovoltaic_etrium_cell') + .EUt(GTValues.VA[GTValues.MV]) + .duration(100) + + event.recipes.gtceu.laser_engraver('ad_astra:photovoltaic_etrium_cell_neutronium') + .itemInputs('gtceu:neutronium_wafer', '#forge:glass_panes', 'gtceu:carbon_fiber_plate') + .itemOutputs('8x ad_astra:photovoltaic_etrium_cell') + .EUt(GTValues.VA[GTValues.MV]) + .duration(100) + + event.shaped('2x ad_astra:solar_panel', [ 'AAA', - 'BCE', - ' F ' + ' C ', + 'BFE' ], { - A: 'gtceu:solar_panel', - B: '#gtceu:batteries/lv', + A: 'ad_astra:photovoltaic_etrium_cell', + B: '#gtceu:batteries/mv', C: '#forge:rods/long/aluminium', E: '#gtceu:circuits/mv', F: 'gtceu:mv_machine_hull' diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 74a0b48c2..02688b59c 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -73,7 +73,8 @@ const registerGTCEUItemTags = (event) => { event.remove('forge:gems', 'gtceu:coke_gem') // Rose Quartz Lens - event.add('forge:lenses/pink', 'gtceu:rose_quartz_lens')} + event.add('forge:lenses/pink', 'gtceu:rose_quartz_lens') +} const registerGTCEUBlockTags = (event) => { diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index 213f4d2bc..1c30eda43 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -19,8 +19,6 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:cryo_freezer', 'ad_astra:wrench', 'ad_astra:cheese_block', - 'ad_astra:photovoltaic_etrium_cell', - 'ad_astra:photovoltaic_vesnium_cell', 'ad_astra:engine_frame', 'ad_astra:fan', 'ad_astra:steel_tank', diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index 9f33ad159..0e9f3f809 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -18,27 +18,35 @@ function registerBetterEndBlocks(event) { event.create('betterend:inflexia', 'tfg:decorative_plant') .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:chorus_grass', 'tfg:decorative_plant') .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:salteago', 'tfg:decorative_plant') .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:vaiolush_fern', 'tfg:decorative_plant') .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') // Mars event.create('betterend:crystal_grass', 'tfg:decorative_plant') .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:blooming_cooksonia', 'tfg:decorative_plant') .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:fracturn', 'tfg:decorative_plant') .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') event.create('betterend:jungle_grass', 'tfg:decorative_plant') .tagItem('tfg:mars_plants') + .tagBlock('minecraft:replaceable') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 5671ffffd..2cb55f6a0 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -222,10 +222,12 @@ function registerTFGSpaceBlocks(event) { .soundType('nether_wart') .lightLevel(0.4) .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') event.create('tfg:lunar_sprouts', 'tfg:decorative_plant') .soundType('nether_wart') .tagItem('tfg:moon_plants') + .tagBlock('minecraft:replaceable') event.create('tfg:corallium_arenicolus_0', 'tfg:double_decorative_plant') .soundType('nether_wart')