diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e1f1172..23f87d30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fixed sprinklers, added support for connecting GregTech pipes to hydroponic planters (#1033) @Thomasx0 - Added some more medicinal plants. @Pyritie - Added lathe recipes to strip logs. @Pyritie +- Iron flask now accepts any cloth, red steel flask now requires phantom silk. @Pyritie ## [0.9.8] - 19.05.2025 ### Changes diff --git a/kubejs/server_scripts/water_flasks/recipes.js b/kubejs/server_scripts/water_flasks/recipes.js index 3e80468ea..8d76359c4 100644 --- a/kubejs/server_scripts/water_flasks/recipes.js +++ b/kubejs/server_scripts/water_flasks/recipes.js @@ -26,7 +26,7 @@ const registerWaterFlasksRecipes = (event) => { event.remove({id: 'waterflasks:heating/red_steel_unfinished_red_steel_flask'}) event.recipes.tfc.heating('waterflasks:unfinished_red_steel_flask', 1535) - .resultFluid(Fluid.of('tfc:metal/red_steel', 144)) + .resultFluid(Fluid.of('gtceu:red_steel', 144)) .useDurability(true) .id('waterflasks:tfc/heating/unfinished_red_steel_flask') @@ -50,24 +50,73 @@ const registerWaterFlasksRecipes = (event) => { //#region Железная фласка - event.replaceInput({ mod: 'waterflasks' }, 'tfc:burlap_cloth', '#forge:cloth') + // For some reason, replaceInput isn't working on these + event.remove({ id: 'waterflasks:crafting/iron_flask' }) + event.shaped('waterflasks:iron_flask', [ + ' AB', + 'CDC', + 'EFE' + ], { + A: '#forge:string', + B: '#forge:tools/knives', + C: '#forge:cloth', + D: 'waterflasks:bladder', + E: 'waterflasks:leather_side', + F: 'waterflasks:unfinished_iron_flask' + }).id('tfg:shaped/iron_flask') + + event.remove({ id: 'waterflasks:crafting/repair_broken_iron' }) + event.shaped('waterflasks:iron_flask', [ + 'AB', + 'CD' + ], { + A: 'waterflasks:broken_iron_flask', + B: 'waterflasks:bladder', + C: '#forge:cloth', + D: '#forge:tools/knives' + }).id('tfg:shaped/repair_broken_iron') + + event.remove({ id: 'waterflasks:crafting/repair_iron' }) + event.shaped('waterflasks:iron_flask', [ + 'AB', + 'CD' + ], { + A: 'waterflasks:iron_flask', + B: 'waterflasks:bladder', + C: '#forge:cloth', + D: '#forge:tools/knives' + }).id('tfg:shaped/repair_iron') + + event.remove({ id: 'waterflasks:crafting/red_steel_flask' }) + event.shaped('waterflasks:red_steel_flask', [ + ' AB', + 'CDC', + 'EFE' + ], { + A: '#forge:string', + B: '#forge:tools/knives', + C: 'tfg:phantom_silk', + D: 'waterflasks:bladder', + E: 'waterflasks:leather_side', + F: 'waterflasks:unfinished_red_steel_flask' + }).id('tfg:shaped/red_steel_flask') event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask') - .itemInputs('2x #forge:cloth', '#forge:string', '#forge:leather', '#forge:plates/wrought_iron') + .itemInputs('2x #forge:cloth', '#forge:string', '#forge:plates/wrought_iron', '3x #forge:foils/rubber') .circuit(5) .itemOutputs('waterflasks:iron_flask') .duration(250) .EUt(16) event.recipes.gtceu.assembler('tfg:water_flasks/iron_flask_repair') - .itemInputs('waterflasks:broken_iron_flask', '#forge:cloth', '#forge:string', '#forge:leather') + .itemInputs('waterflasks:broken_iron_flask', '#forge:cloth', '#forge:foils/rubber') .circuit(6) .itemOutputs('waterflasks:iron_flask') .duration(250) .EUt(16) event.recipes.gtceu.assembler('tfg:water_flasks/red_steel_flask') - .itemInputs('2x tfc:silk_cloth', '#forge:string', '#forge:leather', '#forge:plates/red_steel') + .itemInputs('2x tfg:phantom_silk', '#forge:string', '#forge:plates/red_steel', '3x #forge:foils/rubber') .circuit(5) .itemOutputs('waterflasks:red_steel_flask') .duration(250)