diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ed8c1fa2..3a4c0784e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased ### Changes +- Added artisan table recipes for all pipe mold sizes (#2983) @Redeix ### Bug fixes - Fixed incorrect mechanical mixer recipes for weak and regular colored steel dust (#2977) @Pyritie - Fixed cobble breaking into two cobble blocks (#2980) @Pyritie diff --git a/kubejs/server_scripts/tfg/machines/recipes.molds.js b/kubejs/server_scripts/tfg/machines/recipes.molds.js index f6271a63a..d64f492c7 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.molds.js +++ b/kubejs/server_scripts/tfg/machines/recipes.molds.js @@ -6,58 +6,6 @@ */ function registerTFGMoldRecipes(event) { - /** @type {['huge'|'large'|'normal'|'small'|'tiny']}*/ - const pipe_sizes = [ - 'huge', - 'large', - 'normal', - 'small', - 'tiny' - ]; - - let prev_size; - pipe_sizes.forEach((size) => { - if (size !== 'huge'){ - event.shaped(`gtceu:${size}_pipe_casting_mold`, [ - 'ABC' - ], { - A: '#forge:tools/hammers', - B: `gtceu:${prev_size}_pipe_casting_mold`, - C: '#forge:tools/mallets' - }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) - - event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ - 'ABC' - ], { - A: '#forge:tools/hammers', - B: `gtceu:${prev_size}_pipe_extruder_mold`, - C: '#forge:tools/mallets' - }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) - } - prev_size = size; - }); - - pipe_sizes.reverse().forEach((size) => { - if (size !== 'tiny'){ - event.shaped(`gtceu:${size}_pipe_casting_mold`, [ - 'ABC' - ], { - A: '#forge:tools/mallets', - B: `gtceu:${prev_size}_pipe_casting_mold`, - C: '#forge:tools/hammers' - }).id(`tfg:shaped/${prev_size}_${size}_casting_mold`) - - event.shaped(`gtceu:${size}_pipe_extruder_mold`, [ - 'ABC' - ], { - A: '#forge:tools/mallets', - B: `gtceu:${prev_size}_pipe_extruder_mold`, - C: '#forge:tools/hammers' - }).id(`tfg:shaped/${prev_size}_${size}_extruder_mold`) - } - prev_size = size; - }); - global.TFG_EXTRUDER_MOLDS.forEach(mold => { TFGHelpers.registerMaterialInfo(mold, [GTMaterials.Steel, 4]) diff --git a/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js index 340244b36..8df4d6ff2 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.artisan_table.js @@ -177,7 +177,38 @@ function registerTFGArtisanTableRecipes(event) { " XXXX ", " " ]}, - + { name: 'gtceu:large_pipe', genCast: true, genExtrude: true, pattern: [ + "X ", + "X XXX ", + "X XXX ", + "X XXX ", + "X ", + "XXXXXX" + ]}, + { name: 'gtceu:normal_pipe', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "X X", + "X XX X", + "X XX X", + "X X", + "XXXXXX" + ]}, + { name: 'gtceu:small_pipe', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "XX X", + "XX X X", + "XX X", + "XXXXXX", + "XXXXXX" + ]}, + { name: 'gtceu:tiny_pipe', genCast: true, genExtrude: true, pattern: [ + "XXXXXX", + "XXX XX", + "XX X X", + "XXX XX", + "XXXXXX", + "XXXXXX" + ]}, { name: 'gtceu:rod', genCast: false, genExtrude: true, pattern: [ "XXXXXX", "XXXXXX",