diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 7946b67f8..4e4b1e238 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -848,7 +848,7 @@ const registerCreateRecipes = (event) => { ' CE' ], { A: '#tfg:small_cogwheels', - B: 'create:andesite_casing', + B: 'gtceu:ulv_machine_casing', C: 'create:brass_hand', D: '#forge:tools/wrenches', E: '#forge:tools/screwdrivers', @@ -1361,12 +1361,12 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/vertical_framed_glass') const CREATE_FRAMED_GLASS_WINDOWS = - [ - 'framed_glass', - 'tiled_glass', - 'horizontal_framed_glass', - 'vertical_framed_glass' - ] + [ + 'framed_glass', + 'tiled_glass', + 'horizontal_framed_glass', + 'vertical_framed_glass' + ] CREATE_FRAMED_GLASS_WINDOWS.forEach(x => { event.shapeless(`2x create:${x}_pane`, @@ -1384,17 +1384,18 @@ const registerCreateRecipes = (event) => { }) const CREATE_OTHER_GLASS_WINDOWS = - [ - ['dark_oak', 'tfc:wood/lumber/hickory'], - ['mangrove', 'tfc:wood/lumber/mangrove'], - ['ornate_iron', 'gtceu:wrought_iron_rod'] - ] + [ + ['dark_oak', 'tfc:wood/planks/hickory'], + ['mangrove', 'tfc:wood/planks/mangrove'], + ['ornate_iron', 'tfc:metal/bars/wrought_iron'] + ] CREATE_OTHER_GLASS_WINDOWS.forEach(x => { event.shaped(`2x create:${x[0]}_window`, [ - ' B ', - 'BAB' + ' ', + 'BAB', + ' B ' ], { A: 'minecraft:glass', B: x[1] diff --git a/kubejs/server_scripts/create_connected/recipes.js b/kubejs/server_scripts/create_connected/recipes.js index ade6c0fc4..2bf5f8299 100644 --- a/kubejs/server_scripts/create_connected/recipes.js +++ b/kubejs/server_scripts/create_connected/recipes.js @@ -2,6 +2,11 @@ const registerCreateConnectedRecipes = (event) => { + global.CREATE_CONNECTED_DISABLED_ITEMS.forEach(item => { + event.remove({ input: item }) + event.remove({ output: item }) + }) + // Remove Fluid Vessel Crafting event.remove({ id: 'create_connected:crafting/kinetics/fluid_vessel' }) @@ -50,21 +55,29 @@ const registerCreateConnectedRecipes = (event) => { // Sequenced Pulse Generator event.shaped('create_connected:sequenced_pulse_generator', [ - 'AB ', - 'ACD', + 'DA ', + 'DCD', 'EEE' ], { A: 'create:electron_tube', - B: '#gtceu:circuits/ulv', C: '#forge:plates/bronze', D: 'minecraft:redstone_torch', E: '#forge:stone' }).id('create_connected:crafting/kinetics/sequenced_pulse_generator') - // Shear Pin - event.recipes.gtceu.cutter('tfg:create_connected/shear_pin') - .itemInputs('#tfg:shafts') - .itemOutputs('create_connected:shear_pin') - .duration(96) - .EUt(8) + event.shaped('create_connected:cherry_window_pane', [ + 'ABA', + ' A ' + ], { + A: 'afc:wood/planks/fig', + B: 'minecraft:glass' + }).id('create_connected:shaped/cherry_window_pane') + + event.shaped('create_connected:bamboo_window_pane', [ + ' A ', + 'ABA' + ], { + A: 'minecraft:bamboo_planks', + B: 'minecraft:glass' + }).id('create_connected:shaped/bamboo_window_pane') } \ No newline at end of file diff --git a/kubejs/server_scripts/create_connected/tags.js b/kubejs/server_scripts/create_connected/tags.js index 4dbd1c471..088e8b331 100644 --- a/kubejs/server_scripts/create_connected/tags.js +++ b/kubejs/server_scripts/create_connected/tags.js @@ -1,11 +1,9 @@ const registerCreateConnectedItemTags = (event) => { - // Removes tags from the Cherry and Bamboo wooden panes added by Create Connected - event.removeAllTagsFrom("create_connected:cherry_window_pane") - event.add("c:hidden_from_recipe_viewers", "create_connected:cherry_window_pane") - event.removeAllTagsFrom("create_connected:bamboo_window_pane") - event.add("c:hidden_from_recipe_viewers", "create_connected:bamboo_window_pane") - event.removeAllTagsFrom('create_connected:control_chip') - event.add('c:hidden_from_recipe_viewers', 'create_connected:control_chip') + + global.CREATE_CONNECTED_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) event.remove('minecraft:creeper_drop_music_discs', ['create_connected:music_disc_elevator', 'create_connected:music_disc_interlude']) } \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index aacd70c2e..b33c3f803 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -257,4 +257,42 @@ const registerCreatedecoRecipes = (event) => { .EUt(16) // #region + + // #region Window panes + + const CREATE_DECO_GLASS_WINDOWS = + [ + ['andesite', '#forge:rods/tin_alloy'], + ['copper', '#forge:rods/copper'], + ['iron', '#forge:rods/wrought_iron'], + ['industrial_iron', '#forge:rods/steel'], + ['brass', '#forge:rods/brass'], + ['zinc', '#forge:rods/zinc'] + ] + + CREATE_DECO_GLASS_WINDOWS.forEach(x => { + event.shaped(`2x createdeco:${x[0]}_window`, + [ + ' B ', + 'BAB' + ], { + A: 'minecraft:glass', + B: x[1] + }).id(`createdeco:${x[0]}_window`) + + event.shapeless(`2x createdeco:${x[0]}_window_pane`, + [ + `createdeco:${x[0]}_window`, + '#forge:tools/saws' + ]) + .id(`createdeco:${x[0]}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:createdeco/${x[0]}_window_pane`) + .itemInputs(`3x createdeco:${x[0]}_window`) + .itemOutputs(`8x createdeco:${x[0]}_window_pane`) + .duration(40) + .EUt(7) + }) + + // #endregion }; \ No newline at end of file diff --git a/kubejs/server_scripts/every_compat/recipes.js b/kubejs/server_scripts/every_compat/recipes.js index dbd2b5af0..69ec47d2a 100644 --- a/kubejs/server_scripts/every_compat/recipes.js +++ b/kubejs/server_scripts/every_compat/recipes.js @@ -19,4 +19,44 @@ const registerEveryCompatRecipes = (event) => { .duration(40) .EUt(7) }) + + global.AFC_WOOD_TYPES.forEach(wood => + { + event.remove({ id: `everycomp:c/afc/${wood}_window_pane` }) + + event.shapeless(`2x everycomp:c/afc/${wood}_window_pane`, + [ + `everycomp:c/afc/${wood}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:everycompat/shapeless/${wood}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`) + .itemInputs(`3x everycomp:c/afc/${wood}_window`) + .itemOutputs(`8x everycomp:c/afc/${wood}_window_pane`) + .duration(40) + .EUt(7) + }) + + const DOMUM = [ + 'cactus', + 'cactus_extra' + ] + + DOMUM.forEach(wood => { + event.remove({ id: `everycomp:c/domum_ornamentum/${wood}_window_pane` }) + + event.shapeless(`2x everycomp:c/domum_ornamentum/${wood}_window_pane`, + [ + `everycomp:c/domum_ornamentum/${wood}_window`, + '#forge:tools/saws' + ]) + .id(`tfg:everycompat/shapeless/${wood}_window_pane`) + + event.recipes.gtceu.cutter(`tfg:everycompat/shapeless/${wood}_window_pane`) + .itemInputs(`3x everycomp:c/domum_ornamentum/${wood}_window`) + .itemOutputs(`8x everycomp:c/domum_ornamentum/${wood}_window_pane`) + .duration(40) + .EUt(7) + }) } \ No newline at end of file diff --git a/kubejs/startup_scripts/create_connected/constants.js b/kubejs/startup_scripts/create_connected/constants.js new file mode 100644 index 000000000..be67b4ff7 --- /dev/null +++ b/kubejs/startup_scripts/create_connected/constants.js @@ -0,0 +1,14 @@ +// priority: 0 + +global.CREATE_CONNECTED_DISABLED_ITEMS = [ + 'create_connected:encased_chain_cogwheel', + 'create_connected:parallel_gearbox', + 'create_connected:vertical_parallel_gearbox', + 'create_connected:six_way_gearbox', + 'create_connected:vertical_six_way_gearbox', + 'create_connected:brass_gearbox', + 'create_connected:vertical_brass_gearbox', + 'create_connected:shear_pin', + 'create_connected:control_chip', + 'create_connected:incomplete_control_chip' +] \ No newline at end of file