diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a79a6dbee..bb1fa4cb9 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -47,6 +47,34 @@ const registerGTCEURecipes = (event) => { .duration(100) .EUt(4) + // Treated Wood Planks + event.shaped('8x gtceu:treated_wood_planks', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#minecraft:planks', + B: Item.of('tfc:wooden_bucket', '{fluid:{Amount:1000,FluidName:"gtceu:creosote"}}').strongNBT() + }).id('tfg:shaped/treated_wood_planks_wood_bucket') + + event.shaped('8x gtceu:treated_wood_planks', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#minecraft:planks', + B: Item.of('tfc:metal/bucket/red_steel', '{fluid:{Amount:1000,FluidName:"gtceu:creosote"}}').strongNBT() + }).id('tfg:shaped/treated_wood_planks_red_steel_bucket') + + event.shaped('8x gtceu:treated_wood_planks', [ + 'AAA', + 'ABA', + 'AAA' + ], { + A: '#minecraft:planks', + B: Item.of('tfc:metal/bucket/blue_steel', '{fluid:{Amount:1000,FluidName:"gtceu:creosote"}}').strongNBT() + }).id('tfg:shaped/treated_wood_planks_blue_steel_bucket') + // Quartz Sand Dust event.shaped('gtceu:quartz_sand_dust', [ 'A', diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index ab6b9b30e..56e50bb7d 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -16,6 +16,13 @@ ServerEvents.tags('block', event => { registerTFCBlockTags(event) }) +/** + * Событие регистрации жидкость-тэгов. + */ +ServerEvents.tags('fluid', event => { + registerTFCFluidTags(event) +}) + /** * Здесь регистрируются файлы датапаков (json). * Срабатывает до инициализации рецептов. diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 7f78dbaee..4174ea423 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -52,6 +52,15 @@ const registerTFCRecipes = (event) => { registerAutoTFCCastingRecipes(event) registerAutoTFCAnvilRecipes(event) + // Bucket + addWeldingRecipe(event, + 'tfg:recipes/anvil/vanilla_bucket', + { item: 'tfc:metal/bucket/red_steel' }, + { item: 'tfc:metal/bucket/blue_steel' }, + { item: 'minecraft:bucket' }, + 6 + ) + // Small Copper -> Copper addHeatingItemToFluidRecipe(event, 'tfc:recipes/heating/tfg/small_copper', @@ -205,15 +214,6 @@ const registerTFCRecipes = (event) => { [ "draw_last", "draw_second_last", "hit_third_last" ] ) - // Blue Steel Bucket - addAnvilRecipe(event, - 'tfc:recipes/anvil/tfg/blue_steel_bucket', - { tag: "forge:plates/blue_steel" }, - { item: "tfc:metal/bucket/blue_steel" }, - 6, - [ "bend_last", "bend_second_last", "bend_third_last" ] - ) - // Blue Steel Ingot addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/blue_steel_ingot', @@ -259,15 +259,6 @@ const registerTFCRecipes = (event) => { [ "hit_last", "hit_second_last", "punch_third_last" ] ) - // Red Steel Bucket - addAnvilRecipe(event, - 'tfc:recipes/anvil/tfg/red_steel_bucket', - { tag: "forge:plates/red_steel" }, - { item: "tfc:metal/bucket/red_steel" }, - 6, - [ "bend_last", "bend_second_last", "bend_third_last" ] - ) - // High Carbon Red Steel addAnvilRecipe(event, 'tfc:recipes/anvil/tfg/high_carbon_red_steel', diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index c938d6739..bb992db40 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -79,4 +79,10 @@ const registerTFCItemTags = (event) => { const registerTFCBlockTags = (event) => { event.add('tfc:glass_basin_blocks', 'gtceu:brass_block') event.add('tfc:glass_pouring_table', 'gtceu:brass_block') +} + +const registerTFCFluidTags = (event) => { + event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote') + event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote') + event.add('tfc:usable_in_blue_steel_bucket', 'gtceu:creosote') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 59a533064..80fc7c3b2 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -226,6 +226,13 @@ global.TFC_TOOL_GEN = [ "tuyere", ]; +/** + * Указывает, что у этого металла есть ведро. + */ +global.TFC_BUCKET_GEN = [ + "bucket", +]; + global.ITEM_TAG_TO_HEAT = { nugget: { heat_capacity: 0.124, @@ -1115,6 +1122,19 @@ global.ITEM_TAG_TO_HEAT = { return { item: `gtceu:${name}_rod` }; }, }, + + bucket: { + heat_capacity: 5.714, + metal_amount: 144, + rules: ["bend_last", "bend_second_last", "bend_third_last"], + anvilFrom: "sheet", + input: (name) => { + return { item: `tfc:metal/bucket/${name}` }; + }, + output: (name) => { + return { item: `tfc:metal/bucket/${name}` }; + }, + }, }; global.METAL_TO_SPECS = { @@ -1449,7 +1469,8 @@ global.METAL_TO_SPECS = { global.ARMOR_GEN, global.GT_TOOL_GEN, global.TFC_TOOL_GEN, - global.UTILITY_GEN + global.UTILITY_GEN, + global.TFC_BUCKET_GEN ), }, blue_steel: { @@ -1467,7 +1488,8 @@ global.METAL_TO_SPECS = { global.ARMOR_GEN, global.GT_TOOL_GEN, global.TFC_TOOL_GEN, - global.UTILITY_GEN + global.UTILITY_GEN, + global.TFC_BUCKET_GEN ), }, unknown: {