diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 146f97cf4..f1794d4ce 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -3,7 +3,6 @@ const registerCreateRecipes = (event) => { // Удаление рецептов мода create - /* event.remove({ not: [ { id: 'create:crafting/kinetics/gearboxfrom_conversion' }, { id: 'create:crafting/kinetics/gearbox' }, @@ -90,7 +89,7 @@ const registerCreateRecipes = (event) => { { id: 'create:crafting/kinetics/green_seat' }, { id: 'create:crafting/kinetics/red_seat' }, { id: 'create:crafting/kinetics/black_seat' }, - ], mod: 'create' })*/ + ], mod: 'create' }) // Пушка для постройки схематик event.shaped('create:schematicannon', [ diff --git a/kubejs/server_scripts/firmaciv/recipes.js b/kubejs/server_scripts/firmaciv/recipes.js new file mode 100644 index 000000000..4e9bf0612 --- /dev/null +++ b/kubejs/server_scripts/firmaciv/recipes.js @@ -0,0 +1,7 @@ +// priority: 0 + +const registerFirmaCivRecipes = (event) => { + + event.remove({ id: '/firmaciv:quern/' }) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/firmaciv/tags.js b/kubejs/server_scripts/firmaciv/tags.js new file mode 100644 index 000000000..cbae6827e --- /dev/null +++ b/kubejs/server_scripts/firmaciv/tags.js @@ -0,0 +1,7 @@ +// priority: 0 + +const dead = (event) => { + + // Удаление тегов у отключенных предметов + +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 5fa3297c7..0985128bc 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -74,6 +74,7 @@ TFCEvents.data(event => { ServerEvents.recipes(event => { registerTFCRecipes(event) registerFirmaLifeRecipes(event) + registerFirmaCivRecipes(event) registerWaterFlasksRecipes(event) registerTreeTapRecipes(event) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index b3309e02a..0890aad4a 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -913,6 +913,79 @@ const registerTFCRecipes = (event) => { .resultFluid(Fluid.of('gtceu:bronze', 144)) .id(`tfc:heating/bronze_bell`) + //#region Рецепты ковки TFC слитков в GT машинах + + // Сырая крица -> Укрепленная крица + event.recipes.gtceu.forge_hammer('tfg/refined_bloom') + .itemInputs('tfc:raw_iron_bloom') + .itemOutputs('tfc:refined_iron_bloom') + .duration(1000) + .EUt(4) + + // Укрепленная крица -> Слиток кованного железа + event.recipes.gtceu.forge_hammer('tfg/wrought_iron_ingot') + .itemInputs('tfc:refined_iron_bloom') + .itemOutputs('gtceu:wrought_iron_ingot') + .duration(1000) + .EUt(4) + + // Чугун -> Высокоуглеродная сталь + event.recipes.gtceu.forge_hammer('tfg/high_carbon_steel') + .itemInputs('tfc:metal/ingot/pig_iron') + .itemOutputs('tfc:metal/ingot/high_carbon_steel') + .duration(1000) + .EUt(4) + + // Высокоуглеродная сталь -> Cталь + event.recipes.gtceu.forge_hammer('tfg/steel') + .itemInputs('tfc:metal/ingot/high_carbon_steel') + .itemOutputs('gtceu:steel_ingot') + .duration(1000) + .EUt(4) + + // Высокоуглеродная черная сталь -> черная сталь + event.recipes.gtceu.forge_hammer('tfg/black_steel') + .itemInputs('tfc:metal/ingot/high_carbon_black_steel') + .itemOutputs('gtceu:black_steel_ingot') + .duration(1000) + .EUt(4) + + // Высокоуглеродная синяя сталь -> синяя сталь + event.recipes.gtceu.forge_hammer('tfg/blue_steel') + .itemInputs('tfc:metal/ingot/high_carbon_blue_steel') + .itemOutputs('gtceu:blue_steel_ingot') + .duration(1000) + .EUt(4) + + // Высокоуглеродная красная сталь -> красная сталь + event.recipes.gtceu.forge_hammer('tfg/red_steel') + .itemInputs('tfc:metal/ingot/high_carbon_red_steel') + .itemOutputs('gtceu:red_steel_ingot') + .duration(1000) + .EUt(4) + + // Слабая сталь + Чугун -> Высокоуглеродная черная сталь + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_black_steel') + .itemInputs('tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron') + .itemOutputs('tfc:metal/ingot/high_carbon_black_steel') + .duration(1600) + .EUt(4) + + // Слабая синяя сталь + Черная сталь -> Высокоуглеродная синяя сталь + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_blue_steel') + .itemInputs('tfc:metal/ingot/weak_blue_steel', 'gtceu:black_steel_ingot') + .itemOutputs('tfc:metal/ingot/high_carbon_blue_steel') + .duration(1600) + .EUt(4) + + // Слабая красная сталь + Черная сталь -> Высокоуглеродная красная сталь + event.recipes.gtceu.alloy_smelter('tfg/high_carbon_red_steel') + .itemInputs('tfc:metal/ingot/weak_red_steel', 'gtceu:black_steel_ingot') + .itemOutputs('tfc:metal/ingot/high_carbon_red_steel') + .duration(1600) + .EUt(4) + + //#endregion //#endregion @@ -1902,312 +1975,200 @@ const registerTFCRecipes = (event) => { //#endregion - //#region Порошки + //#region Рецепты порошков + // Удаление рецептов + event.remove({ id: 'tfc:quern/amethyst' }) + event.remove({ id: 'tfc:quern/amethyst_cut' }) + event.remove({ id: 'tfc:quern/blaze_rod' }) + event.remove({ id: 'tfc:quern/borax' }) + event.remove({ id: 'tfc:quern/charcoal' }) + event.remove({ id: 'tfc:quern/cinnabar' }) event.remove({ id: 'tfc:quern/cryolite' }) + event.remove({ id: 'tfc:quern/diamond' }) + event.remove({ id: 'tfc:quern/diamond_cut' }) + event.remove({ id: 'tfc:quern/emerald' }) + event.remove({ id: 'tfc:quern/emerald_cut' }) + event.remove({ id: 'tfc:quern/graphite' }) + event.remove({ id: 'tfc:quern/lapis_lazuli' }) + event.remove({ id: 'tfc:quern/lapis_lazuli_cut' }) + event.remove({ id: 'tfc:quern/normal_bismuthinite' }) + event.remove({ id: 'tfc:quern/normal_cassiterite' }) + event.remove({ id: 'tfc:quern/normal_garnierite' }) + event.remove({ id: 'tfc:quern/normal_hematite' }) + event.remove({ id: 'tfc:quern/normal_limonite' }) + event.remove({ id: 'tfc:quern/normal_magnetite' }) + event.remove({ id: 'tfc:quern/normal_malachite' }) + event.remove({ id: 'tfc:quern/normal_native_copper' }) + event.remove({ id: 'tfc:quern/normal_native_gold' }) + event.remove({ id: 'tfc:quern/normal_native_silver' }) + event.remove({ id: 'tfc:quern/normal_sphalerite' }) + event.remove({ id: 'tfc:quern/normal_tetrahedrite' }) + event.remove({ id: 'tfc:quern/opal' }) + event.remove({ id: 'tfc:quern/opal_cut' }) + event.remove({ id: 'tfc:quern/poor_bismuthinite' }) + event.remove({ id: 'tfc:quern/poor_cassiterite' }) + event.remove({ id: 'tfc:quern/poor_garnierite' }) + event.remove({ id: 'tfc:quern/poor_hematite' }) + event.remove({ id: 'tfc:quern/poor_limonite' }) + event.remove({ id: 'tfc:quern/poor_magnetite' }) + event.remove({ id: 'tfc:quern/poor_malachite' }) + event.remove({ id: 'tfc:quern/poor_native_copper' }) + event.remove({ id: 'tfc:quern/poor_native_gold' }) + event.remove({ id: 'tfc:quern/poor_native_silver' }) + event.remove({ id: 'tfc:quern/poor_sphalerite' }) + event.remove({ id: 'tfc:quern/poor_tetrahedrite' }) + event.remove({ id: 'tfc:quern/pyrite' }) + event.remove({ id: 'tfc:quern/pyrite_cut' }) + event.remove({ id: 'tfc:quern/raw_limestone' }) + event.remove({ id: 'tfc:quern/rich_bismuthinite' }) + event.remove({ id: 'tfc:quern/rich_cassiterite' }) + event.remove({ id: 'tfc:quern/rich_garnierite' }) + event.remove({ id: 'tfc:quern/rich_hematite' }) + event.remove({ id: 'tfc:quern/rich_limonite' }) + event.remove({ id: 'tfc:quern/rich_magnetite' }) + event.remove({ id: 'tfc:quern/rich_malachite' }) + event.remove({ id: 'tfc:quern/rich_native_copper' }) + event.remove({ id: 'tfc:quern/rich_native_gold' }) + event.remove({ id: 'tfc:quern/rich_native_silver' }) + event.remove({ id: 'tfc:quern/rich_sphalerite' }) + event.remove({ id: 'tfc:quern/rich_tetrahedrite' }) + event.remove({ id: 'tfc:quern/ruby' }) + event.remove({ id: 'tfc:quern/ruby_cut' }) + event.remove({ id: 'tfc:quern/salt' }) + event.remove({ id: 'tfc:quern/saltpeter' }) + event.remove({ id: 'tfc:quern/sapphire' }) + event.remove({ id: 'tfc:quern/sapphire_cut' }) + event.remove({ id: 'tfc:quern/sulfur' }) event.remove({ id: 'tfc:quern/sylvite' }) + event.remove({ id: 'tfc:quern/topaz' }) + event.remove({ id: 'tfc:quern/topaz_cut' }) - // 2x Coke Powder - event.recipes.tfc.quern('2x tfc:powder/coke', '#forge:gems/coke') - .id('tfg:quern/coke_powder') + // Добавление рецептов + global.TFC_QUERN_POWDER_RECIPE_COMPONENTS.forEach(element => { + event.recipes.tfc.quern(element.output, element.input) + .id(`tfg:quern/${element.name}`) - // 2x Amethyst Powder - event.recipes.tfc.quern('2x tfc:powder/amethyst', '#forge:raw_materials/amethyst') - .id('tfc:quern/amethyst_cut') + event.recipes.createMilling(element.output, element.input) + .id(`tfg:milling/${element.name}`) + }) - // 2x Diamond Powder - event.recipes.tfc.quern('2x tfc:powder/diamond', '#forge:raw_materials/diamond') - .id('tfc:quern/diamond_cut') + //#endregion + + //#region Рецепты муки + + global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS.forEach(element => { + event.recipes.gtceu.macerator(`tfg:${element.name}`) + .itemInputs(element.input) + .itemOutputs(element.output) + .duration(200) + .EUt(16) + + event.recipes.createMilling(element.output, element.input) + .id(`tfg:quern/${element.name}`) + }) + + //#endregion + + //#region Рецепты обжарки мяса + + global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS.forEach(element => { + event.smelting(element.output, element.input) + .id(`tfg:smelting/${element.name}`) + }) + + //#endregion + + //#region Рецепты обжарки форм - // 2x Emerald Powder - event.recipes.tfc.quern('2x tfc:powder/emerald', '#forge:raw_materials/emerald') - .id('tfc:quern/emerald_cut') + global.TFC_FURNACE_MOLD_RECIPE_COMPONENTS.forEach(element => { + event.smelting(element.output, element.input) + .id(`tfg:smelting/${element.name}`) + }) - // 2x Lapis Lazuli Powder - event.recipes.tfc.quern('2x tfc:powder/lapis_lazuli', '#forge:raw_materials/lapis') - .id('tfc:quern/lapis_lazuli_cut') + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.smelting(`tfc:ceramic/${dye}_glazed_vessel`, `tfc:ceramic/${dye}_unfired_vessel`) + .id(`tfg:smelting/${dye}_glazed_vessel`) - // 2x Opal Powder - event.recipes.tfc.quern('2x tfc:powder/opal', '#forge:raw_materials/opal') - .id('tfc:quern/opal_cut') + event.smelting(`tfc:ceramic/large_vessel/${dye}`, `tfc:ceramic/unfired_large_vessel/${dye}`) + .id(`tfg:smelting/${dye}_large_vessel`) + }) - // 2x Pyrite Powder - event.recipes.tfc.quern('2x tfc:powder/pyrite', '#forge:raw_materials/pyrite') - .id('tfc:quern/pyrite_cut') + //#endregion - // 2x Ruby Powder - event.recipes.tfc.quern('2x tfc:powder/ruby', '#forge:raw_materials/ruby') - .id('tfc:quern/ruby_cut') + //#region Покраска малых и больших сосудов - // 2x Sapphire Powder - event.recipes.tfc.quern('2x tfc:powder/sapphire', '#forge:raw_materials/sapphire') - .id('tfc:quern/sapphire_cut') - - // 2x Topaz Powder - event.recipes.tfc.quern('2x tfc:powder/topaz', '#forge:raw_materials/topaz') - .id('tfc:quern/topaz_cut') - - // 1x Gold Powder - event.recipes.tfc.quern('1x tfc:powder/native_gold', 'tfc:ore/small_native_gold') - .id('tfc:quern/small_native_gold') - - // 4x Gold Powder - event.recipes.tfc.quern('4x tfc:powder/native_gold', '#forge:raw_materials/gold') - .id('tfc:quern/normal_native_gold') - - // 1x Silver Powder - event.recipes.tfc.quern('1x tfc:powder/native_silver', 'tfc:ore/small_native_silver') - .id('tfc:quern/small_native_silver') - - // 4x Silver Powder - event.recipes.tfc.quern('4x tfc:powder/native_silver', '#forge:raw_materials/silver') - .id('tfc:quern/normal_native_silver') - - // 1x Cassiterite Powder - event.recipes.tfc.quern('1x tfc:powder/cassiterite', 'tfc:ore/small_cassiterite') - .id('tfc:quern/small_cassiterite') - - // 4x Cassiterite Powder - event.recipes.tfc.quern('4x tfc:powder/cassiterite', '#forge:raw_materials/cassiterite') - .id('tfc:quern/normal_cassiterite') - - // 1x Bismuth Powder - event.recipes.tfc.quern('1x tfc:powder/bismuthinite', 'tfc:ore/small_bismuthinite') - .id('tfc:quern/small_bismuthinite') - - // 4x Bismuth Powder - event.recipes.tfc.quern('4x tfc:powder/bismuthinite', '#forge:raw_materials/bismuth') - .id('tfc:quern/normal_bismuthinite') - - // 1x Garnierite Powder - event.recipes.tfc.quern('1x tfc:powder/garnierite', 'tfc:ore/small_garnierite') - .id('tfc:quern/small_garnierite') - - // 4x Garnierite Powder - event.recipes.tfc.quern('4x tfc:powder/garnierite', '#forge:raw_materials/garnierite') - .id('tfc:quern/normal_garnierite') - - - // 4x Nickel Powder - event.recipes.tfc.quern('4x tfc:powder/garnierite', '#forge:raw_materials/nickel') - .id('tfc:quern/normal_nickel') - - // 1x Sphalerite Powder - event.recipes.tfc.quern('1x tfc:powder/sphalerite', 'tfc:ore/small_sphalerite') - .id('tfc:quern/small_sphalerite') - - // 4x Sphalerite Powder - event.recipes.tfc.quern('4x tfc:powder/sphalerite', '#forge:raw_materials/sphalerite') - .id('tfc:quern/normal_sphalerite') - - // 1x Magnetite Powder - event.recipes.tfc.quern('1x tfc:powder/magnetite', 'tfc:ore/small_magnetite') - .id('tfc:quern/small_magnetite') - - // 4x Magnetite Powder - event.recipes.tfc.quern('4x tfc:powder/magnetite', '#forge:raw_materials/magnetite') - .id('tfc:quern/normal_magnetite') - - // 1x Tetrahedrite Powder - event.recipes.tfc.quern('1x tfc:powder/tetrahedrite', 'tfc:ore/small_tetrahedrite') - .id('tfc:quern/small_tetrahedrite') - - // 4x Tetrahedrite Powder - event.recipes.tfc.quern('4x tfc:powder/tetrahedrite', '#forge:raw_materials/tetrahedrite') - .id('tfc:quern/normal_tetrahedrite') - - // 1x Malachite Powder - event.recipes.tfc.quern('1x tfc:powder/malachite', 'tfc:ore/small_malachite') - .id('tfc:quern/small_malachite') - - // 4x Malachite Powder - event.recipes.tfc.quern('4x tfc:powder/malachite', '#forge:raw_materials/malachite') - .id('tfc:quern/normal_malachite') - - // 1x Malachite Powder - event.recipes.tfc.quern('1x tfc:powder/limonite', 'tfc:ore/small_limonite') - .id('tfc:quern/small_limonite') - - // 4x Limonite Powder - event.recipes.tfc.quern('4x tfc:powder/limonite', '#forge:raw_materials/yellow_limonite') - .id('tfc:quern/normal_limonite') - - // 1x Hematite Powder - event.recipes.tfc.quern('1x tfc:powder/hematite', 'tfc:ore/small_hematite') - .id('tfc:quern/small_hematite') - - // 4x Hematite Powder - event.recipes.tfc.quern('4x tfc:powder/hematite', '#forge:raw_materials/hematite') - .id('tfc:quern/normal_hematite') + //#region Обычный сосуд - // 1x Copper Powder - event.recipes.tfc.quern('1x tfc:powder/native_copper', 'tfc:ore/small_native_copper') - .id('tfc:quern/small_native_copper') + event.recipes.gtceu.chemical_bath(`unfired_vessel_decolor`) + .itemInputs('#tfg:colorized_unfired_vessels') + .inputFluids(Fluid.of(`gtceu:chlorine`, 36)) + .itemOutputs('tfc:ceramic/unfired_vessel') + .duration(300) + .EUt(4) - // 4x Copper Powder - event.recipes.tfc.quern('4x tfc:powder/native_copper', '#forge:raw_materials/copper') - .id('tfc:quern/normal_native_copper') + event.recipes.gtceu.chemical_bath(`fired_vessel_decolor`) + .itemInputs('#tfg:colorized_fired_vessels') + .inputFluids(Fluid.of(`gtceu:chlorine`, 36)) + .itemOutputs('tfc:ceramic/vessel') + .duration(300) + .EUt(4) - // 4x Cinnabar Powder - event.recipes.tfc.quern('4x minecraft:redstone', '#forge:raw_materials/cinnabar') - .id('tfc:quern/normal_cinnabar') + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.gtceu.chemical_bath(`${dye}_unfired_vessel`) + .itemInputs('tfc:ceramic/unfired_vessel') + .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 36)) + .itemOutputs(`tfc:ceramic/${dye}_unfired_vessel`) + .duration(150) + .EUt(4) - // 4x Sulfur Powder - event.recipes.tfc.quern('4x tfc:powder/sulfur', '#forge:raw_materials/sulfur') - .id('tfc:quern/normal_sulfur') - - // 4x Saltpeter Powder - event.recipes.tfc.quern('4x tfc:powder/saltpeter', '#forge:raw_materials/saltpeter') - .id('tfc:quern/normal_saltpeter') - - // 4x Salt Powder - event.recipes.tfc.quern('4x tfc:powder/salt', '#forge:raw_materials/salt') - .id('tfc:quern/normal_salt') - - // 4x Graphite Powder - event.recipes.tfc.quern('4x tfc:powder/graphite', '#forge:raw_materials/graphite') - .id('tfc:quern/normal_graphite_2') - - // 4x Borax Powder - event.recipes.tfc.quern('4x tfc:powder/flux', '#forge:raw_materials/borax') - .id('tfc:quern/normal_borax') + event.recipes.gtceu.chemical_bath(`${dye}_vessel`) + .itemInputs('tfc:ceramic/vessel') + .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 36)) + .itemOutputs(`tfc:ceramic/${dye}_glazed_vessel`) + .duration(150) + .EUt(4) + }) //#endregion - //#region Мука + //#region Большой сосуд + + event.recipes.gtceu.chemical_bath(`unfired_large_vessel_decolor`) + .itemInputs('#tfg:colorized_unfired_large_vessels') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs('tfc:ceramic/unfired_large_vessel') + .duration(300) + .EUt(4) - // Barley Grain -> Barley Floor - event.recipes.gtceu.macerator('barley_flour') - .itemInputs('tfc:food/barley_grain') - .itemOutputs('2x tfc:food/barley_flour') - .duration(400) - .EUt(16) + event.recipes.gtceu.chemical_bath(`fired_large_vessel_decolor`) + .itemInputs('#tfg:colorized_large_vessels') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs('tfc:ceramic/large_vessel') + .duration(300) + .EUt(4) - // Maize Grain -> Maize Floor - event.recipes.gtceu.macerator('maize_flour') - .itemInputs('tfc:food/maize_grain') - .itemOutputs('2x tfc:food/maize_flour') - .duration(400) - .EUt(16) + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.recipes.gtceu.chemical_bath(`${dye}_large_unfired_vessel`) + .itemInputs('tfc:ceramic/unfired_large_vessel') + .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72)) + .itemOutputs(`tfc:ceramic/unfired_large_vessel/${dye}`) + .duration(150) + .EUt(4) - // Oat Grain -> Oat Floor - event.recipes.gtceu.macerator('oat_flour') - .itemInputs('tfc:food/oat_grain') - .itemOutputs('2x tfc:food/oat_flour') - .duration(400) - .EUt(16) - - // Rye Grain -> Rye Floor - event.recipes.gtceu.macerator('rye_flour') - .itemInputs('tfc:food/rye_grain') - .itemOutputs('2x tfc:food/rye_flour') - .duration(400) - .EUt(16) - - // Rice Grain -> Rice Floor - event.recipes.gtceu.macerator('rice_flour') - .itemInputs('tfc:food/rice_grain') - .itemOutputs('2x tfc:food/rice_flour') - .duration(400) - .EUt(16) - - // Wheat Grain -> Wheat Floor - event.recipes.gtceu.macerator('wheat_flour') - .itemInputs('tfc:food/wheat_grain') - .itemOutputs('2x tfc:food/wheat_flour') - .duration(400) - .EUt(16) + event.recipes.gtceu.chemical_bath(`${dye}_large_vessel`) + .itemInputs('tfc:ceramic/large_vessel') + .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72)) + .itemOutputs(`tfc:ceramic/large_vessel/${dye}`) + .duration(150) + .EUt(4) + }) //#endregion - //#region Рецепты ковки слитков в GT машинах - - // Сырая крица -> Укрепленная крица - event.recipes.gtceu.forge_hammer('tfg/refined_bloom') - .itemInputs('tfc:raw_iron_bloom') - .itemOutputs('tfc:refined_iron_bloom') - .duration(1000) - .EUt(4) - - // Укрепленная крица -> Слиток кованного железа - event.recipes.gtceu.forge_hammer('tfg/wrought_iron_ingot') - .itemInputs('tfc:refined_iron_bloom') - .itemOutputs('gtceu:wrought_iron_ingot') - .duration(1000) - .EUt(4) - - // Чугун -> Высокоуглеродная сталь - event.recipes.gtceu.forge_hammer('tfg/high_carbon_steel') - .itemInputs('tfc:metal/ingot/pig_iron') - .itemOutputs('tfc:metal/ingot/high_carbon_steel') - .duration(1000) - .EUt(4) - - // Высокоуглеродная сталь -> Cталь - event.recipes.gtceu.forge_hammer('tfg/steel') - .itemInputs('tfc:metal/ingot/high_carbon_steel') - .itemOutputs('gtceu:steel_ingot') - .duration(1000) - .EUt(4) - - // Высокоуглеродная черная сталь -> черная сталь - event.recipes.gtceu.forge_hammer('tfg/black_steel') - .itemInputs('tfc:metal/ingot/high_carbon_black_steel') - .itemOutputs('gtceu:black_steel_ingot') - .duration(1000) - .EUt(4) - - // Высокоуглеродная синяя сталь -> синяя сталь - event.recipes.gtceu.forge_hammer('tfg/blue_steel') - .itemInputs('tfc:metal/ingot/high_carbon_blue_steel') - .itemOutputs('gtceu:blue_steel_ingot') - .duration(1000) - .EUt(4) - - // Высокоуглеродная красная сталь -> красная сталь - event.recipes.gtceu.forge_hammer('tfg/red_steel') - .itemInputs('tfc:metal/ingot/high_carbon_red_steel') - .itemOutputs('gtceu:red_steel_ingot') - .duration(1000) - .EUt(4) - - // Слабая сталь + Чугун -> Высокоуглеродная черная сталь - event.recipes.gtceu.alloy_smelter('tfg/high_carbon_black_steel') - .itemInputs('tfc:metal/ingot/weak_steel', 'tfc:metal/ingot/pig_iron') - .itemOutputs('tfc:metal/ingot/high_carbon_black_steel') - .duration(1600) - .EUt(4) - - // Слабая синяя сталь + Черная сталь -> Высокоуглеродная синяя сталь - event.recipes.gtceu.alloy_smelter('tfg/high_carbon_blue_steel') - .itemInputs('tfc:metal/ingot/weak_blue_steel', 'gtceu:black_steel_ingot') - .itemOutputs('tfc:metal/ingot/high_carbon_blue_steel') - .duration(1600) - .EUt(4) - - // Слабая красная сталь + Черная сталь -> Высокоуглеродная красная сталь - event.recipes.gtceu.alloy_smelter('tfg/high_carbon_red_steel') - .itemInputs('tfc:metal/ingot/weak_red_steel', 'gtceu:black_steel_ingot') - .itemOutputs('tfc:metal/ingot/high_carbon_red_steel') - .duration(1600) - .EUt(4) - //#endregion - //#region Выход: Wool Yarn - - event.recipes.gtceu.macerator('macerate_wool') - .itemInputs('#minecraft:wool') - .itemOutputs('tfc:wool_yarn') - .chancedOutput('tfc:wool_yarn', 9000, 0) - .chancedOutput('tfc:wool_yarn', 5000, 0) - .chancedOutput('tfc:wool_yarn', 2000, 0) - .duration(200) - .EUt(2) - - //#endregion - - //#region Выход: Лопасти ветряной мельницы + //#region Удаление рецептов лопастей ветряной мельницы event.remove({ id: `tfc:crafting/windmill_blade` }) event.remove({ id: `tfc:barrel/dye/bleach_windmill_blades` }) @@ -2218,24 +2179,7 @@ const registerTFCRecipes = (event) => { //#endregion - //#region Обжарка мяса - - global.TFC_COOKABLE_MEAT.forEach(meat => { - let raw_variant = meat.replace('%s_', '') - let cooked_variant = meat.replace('%s', 'cooked') - - let id = raw_variant.split('/') - - event.smelting(cooked_variant, raw_variant) - .id(`tfg:smelting/${id[1]}_to_cooked`) - }) - - event.smelting('tfc:food/cooked_egg', 'minecraft:egg') - .id(`tfg:smelting/raw_egg_to_cooked`) - - //#endregion - - //#region Выход: Каменные инструменты + //#region Удаление рецептов каменных инструментов TFC //#region Топор @@ -2472,6 +2416,16 @@ const registerTFCRecipes = (event) => { event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay') .id('tfg:smelting/fireclay_brick') + // Wool yarn + event.recipes.gtceu.macerator('macerate_wool') + .itemInputs('#minecraft:wool') + .itemOutputs('tfc:wool_yarn') + .chancedOutput('tfc:wool_yarn', 9000, 0) + .chancedOutput('tfc:wool_yarn', 5000, 0) + .chancedOutput('tfc:wool_yarn', 2000, 0) + .duration(200) + .EUt(2) + // LimeWater + Sand -> Mortar event.recipes.gtceu.centrifuge('mortar') .itemInputs('#forge:sand') @@ -2479,11 +2433,4 @@ const registerTFCRecipes = (event) => { .itemOutputs('16x tfc:mortar') .duration(800) .EUt(8) - - // Обжарка оголовий в печке - for (let i = 0; i < global.TFC_UNFIRED_MOLDS.length; i++) { - event.smelting(global.TFC_FIRED_MOLDS[i], global.TFC_UNFIRED_MOLDS[i]) - .id(`tfg:smelting/mold_${i}`) - } - } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 1cc920d65..4bc8a2314 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -74,6 +74,16 @@ const registerTFCItemTags = (event) => { event.add('tfg:bladed_axles', `tfc:wood/bladed_axle/${woodType}`) }) + // Теги для сосудов по цветам + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.add('tfg:colorized_unfired_vessels', `tfc:ceramic/${dye}_unfired_vessel`) + event.add('tfg:colorized_fired_vessels', `tfc:ceramic/${dye}_glazed_vessel`) + + event.add('tfg:colorized_unfired_large_vessels', `tfc:ceramic/unfired_large_vessel/${dye}`) + event.add('tfg:colorized_fired_large_vessels', `tfc:ceramic/large_vessel/${dye}`) + + }) + // Цвета гравия // Коричневый event.add('tfc:brown_gravel', 'tfc:rock/gravel/claystone') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index cd3d6473e..f1cdd2a22 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1496,77 +1496,113 @@ global.TFC_ORE_MATERIALS = [ "tetrahedrite" ]; -global.TFC_UNFIRED_MOLDS = [ - "tfc:ceramic/unfired_ingot_mold", - "tfc:ceramic/unfired_pickaxe_head_mold", - "tfc:ceramic/unfired_propick_head_mold", - "tfc:ceramic/unfired_axe_head_mold", - "tfc:ceramic/unfired_shovel_head_mold", - "tfc:ceramic/unfired_hoe_head_mold", - "tfc:ceramic/unfired_chisel_head_mold", - "tfc:ceramic/unfired_hammer_head_mold", - "tfc:ceramic/unfired_saw_blade_mold", - "tfc:ceramic/unfired_javelin_head_mold", - "tfc:ceramic/unfired_sword_blade_mold", - "tfc:ceramic/unfired_mace_head_mold", - "tfc:ceramic/unfired_knife_blade_mold", - "tfc:ceramic/unfired_scythe_blade_mold", - "tfc:ceramic/unfired_bell_mold", - "tfc:ceramic/unfired_fire_ingot_mold", +global.TFC_FURNACE_MOLD_RECIPE_COMPONENTS = [ + { input: 'tfc:ceramic/unfired_ingot_mold', output: 'tfc:ceramic/ingot_mold', name: 'ingot_mold' }, + { input: 'tfc:ceramic/unfired_pickaxe_head_mold', output: 'tfc:ceramic/pickaxe_head_mold', name: 'pickaxe_head_mold' }, + { input: 'tfc:ceramic/unfired_propick_head_mold', output: 'tfc:ceramic/propick_head_mold', name: 'propick_head_mold' }, + { input: 'tfc:ceramic/unfired_axe_head_mold', output: 'tfc:ceramic/axe_head_mold', name: 'axe_head_mold' }, + { input: 'tfc:ceramic/unfired_shovel_head_mold', output: 'tfc:ceramic/shovel_head_mold', name: 'shovel_head_mold' }, + { input: 'tfc:ceramic/unfired_hoe_head_mold', output: 'tfc:ceramic/hoe_head_mold', name: 'hoe_head_mold' }, + { input: 'tfc:ceramic/unfired_chisel_head_mold', output: 'tfc:ceramic/chisel_head_mold', name: 'chisel_head_mold' }, + { input: 'tfc:ceramic/unfired_hammer_head_mold', output: 'tfc:ceramic/hammer_head_mold', name: 'hammer_head_mold' }, + { input: 'tfc:ceramic/unfired_saw_blade_mold', output: 'tfc:ceramic/saw_blade_mold', name: 'saw_blade_mold' }, + { input: 'tfc:ceramic/unfired_javelin_head_mold', output: 'tfc:ceramic/javelin_head_mold', name: 'javelin_head_mold' }, + { input: 'tfc:ceramic/unfired_sword_blade_mold', output: 'tfc:ceramic/sword_blade_mold', name: 'sword_blade_mold' }, + { input: 'tfc:ceramic/unfired_mace_head_mold', output: 'tfc:ceramic/mace_head_mold', name: 'mace_head_mold' }, + { input: 'tfc:ceramic/unfired_knife_blade_mold', output: 'tfc:ceramic/knife_blade_mold', name: 'knife_blade_mold' }, + { input: 'tfc:ceramic/unfired_scythe_blade_mold', output: 'tfc:ceramic/scythe_blade_mold', name: 'scythe_blade_mold' }, + { input: 'tfc:ceramic/unfired_bell_mold', output: 'tfc:ceramic/bell_mold', name: 'bell_mold' }, + { input: 'tfc:ceramic/unfired_fire_ingot_mold', output: 'tfc:ceramic/fire_ingot_mold', name: 'fire_ingot_mold' }, + { input: 'tfc:ceramic/unfired_brick', output: 'minecraft:brick', name: 'brick' }, + { input: 'tfc:ceramic/unfired_crucible', output: 'tfc:crucible', name: 'crucible' }, + { input: 'tfc:ceramic/unfired_flower_pot', output: 'minecraft:flower_pot', name: 'flower_pot' }, + { input: 'tfc:ceramic/unfired_pan', output: 'tfc:pan/empty', name: 'pan' }, + { input: 'tfc:ceramic/unfired_blowpipe', output: 'tfc:ceramic_blowpipe', name: 'ceramic_blowpipe' }, + { input: 'tfc:ceramic/unfired_bowl', output: 'tfc:ceramic/bowl', name: 'bowl' }, + { input: 'tfc:ceramic/unfired_fire_brick', output: 'tfc:ceramic/fire_brick', name: 'fire_brick' }, + { input: 'tfc:ceramic/unfired_jug', output: 'tfc:ceramic/jug', name: 'jug' }, + { input: 'tfc:ceramic/unfired_pot', output: 'tfc:ceramic/pot', name: 'pot' }, + { input: 'tfc:ceramic/unfired_spindle_head', output: 'tfc:ceramic/spindle_head', name: 'spindle_head' }, + { input: 'tfc:ceramic/unfired_vessel', output: 'tfc:ceramic/vessel', name: 'vessel' }, + { input: 'tfc:ceramic/unfired_large_vessel', output: 'tfc:ceramic/large_vessel', name: 'large_vessel' }, ]; -global.TFC_FIRED_MOLDS = [ - "tfc:ceramic/ingot_mold", - "tfc:ceramic/pickaxe_head_mold", - "tfc:ceramic/propick_head_mold", - "tfc:ceramic/axe_head_mold", - "tfc:ceramic/shovel_head_mold", - "tfc:ceramic/hoe_head_mold", - "tfc:ceramic/chisel_head_mold", - "tfc:ceramic/hammer_head_mold", - "tfc:ceramic/saw_blade_mold", - "tfc:ceramic/javelin_head_mold", - "tfc:ceramic/sword_blade_mold", - "tfc:ceramic/mace_head_mold", - "tfc:ceramic/knife_blade_mold", - "tfc:ceramic/scythe_blade_mold", - "tfc:ceramic/bell_mold", - "tfc:ceramic/fire_ingot_mold", +global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS = [ + { input: 'tfc:food/horse_meat', output: 'tfc:food/cooked_horse_meat', name: 'cooked_horse_meat' }, + { input: 'tfc:food/bear', output: 'tfc:food/cooked_bear', name: 'cooked_bear' }, + { input: 'tfc:food/mutton', output: 'tfc:food/cooked_mutton', name: 'cooked_mutton' }, + { input: 'tfc:food/pheasant', output: 'tfc:food/cooked_pheasant', name: 'cooked_pheasant' }, + { input: 'tfc:food/quail', output: 'tfc:food/cooked_quail', name: 'cooked_quail' }, + { input: 'tfc:food/chicken', output: 'tfc:food/cooked_chicken', name: 'cooked_chicken' }, + { input: 'tfc:food/pork', output: 'tfc:food/cooked_pork', name: 'cooked_pork' }, + { input: 'tfc:food/beef', output: 'tfc:food/cooked_beef', name: 'cooked_beef' }, + { input: 'tfc:food/crappie', output: 'tfc:food/cooked_crappie', name: 'cooked_crappie' }, + { input: 'tfc:food/lake_trout', output: 'tfc:food/cooked_lake_trout', name: 'cooked_lake_trout' }, + { input: 'tfc:food/largemouth_bass', output: 'tfc:food/cooked_largemouth_bass', name: 'cooked_largemouth_bass' }, + { input: 'tfc:food/rainbow_trout', output: 'tfc:food/cooked_rainbow_trout', name: 'cooked_rainbow_trout' }, + { input: 'tfc:food/salmon', output: 'tfc:food/cooked_salmon', name: 'cooked_salmon' }, + { input: 'tfc:food/smallmouth_bass', output: 'tfc:food/cooked_smallmouth_bass', name: 'cooked_smallmouth_bass' }, + { input: 'tfc:food/camelidae', output: 'tfc:food/cooked_camelidae', name: 'cooked_camelidae' }, + { input: 'tfc:food/frog_legs', output: 'tfc:food/cooked_frog_legs', name: 'cooked_frog_legs' }, + { input: 'tfc:food/gran_feline', output: 'tfc:food/cooked_gran_feline', name: 'cooked_gran_feline' }, + { input: 'tfc:food/turtle', output: 'tfc:food/cooked_turtle', name: 'cooked_turtle' }, + { input: 'tfc:food/cod', output: 'tfc:food/cooked_cod', name: 'cooked_cod' }, + { input: 'tfc:food/tropical_fish', output: 'tfc:food/cooked_tropical_fish', name: 'cooked_tropical_fish' }, + { input: 'tfc:food/calamari', output: 'tfc:food/cooked_calamari', name: 'cooked_calamari' }, + { input: 'tfc:food/shellfish', output: 'tfc:food/cooked_shellfish', name: 'cooked_shellfish' }, + { input: 'tfc:food/bluegill', output: 'tfc:food/cooked_bluegill', name: 'cooked_bluegill' }, + { input: 'tfc:food/turkey', output: 'tfc:food/cooked_turkey', name: 'cooked_turkey' }, + { input: 'tfc:food/peafowl', output: 'tfc:food/cooked_peafowl', name: 'cooked_peafowl' }, + { input: 'tfc:food/grouse', output: 'tfc:food/cooked_grouse', name: 'cooked_grouse' }, + { input: 'tfc:food/venison', output: 'tfc:food/cooked_venison', name: 'cooked_venison' }, + { input: 'tfc:food/wolf', output: 'tfc:food/cooked_wolf', name: 'cooked_wolf' }, + { input: 'tfc:food/rabbit', output: 'tfc:food/cooked_rabbit', name: 'cooked_rabbit' }, + { input: 'tfc:food/hyena', output: 'tfc:food/cooked_hyena', name: 'cooked_hyena' }, + { input: 'tfc:food/duck', output: 'tfc:food/cooked_duck', name: 'cooked_duck' }, + { input: 'tfc:food/chevon', output: 'tfc:food/cooked_chevon', name: 'cooked_chevon' }, + { input: 'minecraft:egg', output: 'tfc:food/cooked_egg', name: 'cooked_egg' }, ]; -global.TFC_COOKABLE_MEAT = [ - 'tfc:food/%s_horse_meat', - 'tfc:food/%s_bear', - 'tfc:food/%s_mutton', - 'tfc:food/%s_pheasant', - 'tfc:food/%s_quail', - 'tfc:food/%s_chicken', - 'tfc:food/%s_pork', - 'tfc:food/%s_beef', - 'tfc:food/%s_crappie', - 'tfc:food/%s_lake_trout', - 'tfc:food/%s_largemouth_bass', - 'tfc:food/%s_rainbow_trout', - 'tfc:food/%s_salmon', - 'tfc:food/%s_smallmouth_bass', - 'tfc:food/%s_camelidae', - 'tfc:food/%s_frog_legs', - 'tfc:food/%s_gran_feline', - 'tfc:food/%s_turtle', - 'tfc:food/%s_cod', - 'tfc:food/%s_tropical_fish', - 'tfc:food/%s_calamari', - 'tfc:food/%s_shellfish', - 'tfc:food/%s_bluegill', - 'tfc:food/%s_turkey', - 'tfc:food/%s_peafowl', - 'tfc:food/%s_grouse', - 'tfc:food/%s_venison', - 'tfc:food/%s_wolf', - 'tfc:food/%s_rabbit', - 'tfc:food/%s_hyena', - 'tfc:food/%s_duck', - 'tfc:food/%s_chevon' +global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ + { input: '#forge:gems/coke', output: '4x tfc:powder/coke', name: 'coke_powder' }, + { input: '#forge:raw_materials/amethyst', output: '4x tfc:powder/amethyst', name: 'amethyst_powder' }, + { input: '#forge:raw_materials/diamond', output: '4x tfc:powder/diamond', name: 'diamond_powder' }, + { input: '#forge:raw_materials/emerald', output: '4x tfc:powder/emerald', name: 'emerald_powder' }, + { input: '#forge:raw_materials/lapis', output: '4x tfc:powder/lapis_lazuli', name: 'lapis_powder' }, + { input: '#forge:raw_materials/opal', output: '4x tfc:powder/opal', name: 'opal_powder' }, + { input: '#forge:raw_materials/pyrite', output: '4x tfc:powder/pyrite', name: 'pyrite_powder' }, + { input: '#forge:raw_materials/ruby', output: '4x tfc:powder/ruby', name: 'ruby_powder' }, + { input: '#forge:raw_materials/sapphire', output: '4x tfc:powder/sapphire', name: 'sapphire_powder' }, + { input: '#forge:raw_materials/topaz', output: '4x tfc:powder/topaz', name: 'topaz_powder' }, + { input: '#forge:raw_materials/gold', output: '4x tfc:powder/native_gold', name: 'gold_powder' }, + { input: '#forge:raw_materials/silver', output: '4x tfc:powder/native_silver', name: 'silver_powder' }, + { input: '#forge:raw_materials/copper', output: '4x tfc:powder/native_copper', name: 'copper_powder' }, + { input: '#forge:raw_materials/cassiterite', output: '4x tfc:powder/cassiterite', name: 'cassiterite_powder' }, + { input: '#forge:raw_materials/bismuth', output: '4x tfc:powder/bismuthinite', name: 'bismuth_powder' }, + { input: '#forge:raw_materials/garnierite', output: '4x tfc:powder/garnierite', name: 'garnierite_powder' }, + { input: '#forge:raw_materials/nickel', output: '4x tfc:powder/garnierite', name: 'nickel_powder' }, + { input: '#forge:raw_materials/sphalerite', output: '4x tfc:powder/sphalerite', name: 'sphalerite_powder' }, + { input: '#forge:raw_materials/magnetite', output: '4x tfc:powder/magnetite', name: 'magnetite_powder' }, + { input: '#forge:raw_materials/tetrahedrite', output: '4x tfc:powder/tetrahedrite', name: 'tetrahedrite_powder' }, + { input: '#forge:raw_materials/malachite', output: '4x tfc:powder/malachite', name: 'malachite_powder' }, + { input: '#forge:raw_materials/yellow_limonite', output: '4x tfc:powder/limonite', name: 'limonite_powder' }, + { input: '#forge:raw_materials/hematite', output: '4x tfc:powder/hematite', name: 'hematite_powder' }, + { input: '#forge:raw_materials/cinnabar', output: '4x minecraft:redstone', name: 'cinnabar_powder' }, + { input: '#forge:raw_materials/sulfur', output: '4x tfc:powder/sulfur', name: 'sulfur_powder' }, + { input: '#forge:raw_materials/saltpeter', output: '4x tfc:powder/saltpeter', name: 'saltpeter_powder' }, + { input: '#forge:raw_materials/salt', output: '4x tfc:powder/salt', name: 'salt_powder' }, + { input: '#forge:raw_materials/graphite', output: '4x tfc:powder/graphite', name: 'graphite_powder' }, + { input: '#forge:raw_materials/borax', output: '4x tfc:powder/', name: '_powder' }, + { input: '#forge:raw_materials/', output: '4x tfc:powder/flux', name: 'flux_powder' }, +]; + +global.TFC_QUERN_FLOUR_RECIPE_COMPONENTS = [ + { input: 'tfc:food/barley_grain', output: '2x tfc:food/barley_flour', name: 'barley_flour' }, + { input: 'tfc:food/maize_grain', output: '2x tfc:food/maize_flour', name: 'maize_flour' }, + { input: 'tfc:food/oat_grain', output: '2x tfc:food/oat_flour', name: 'oat_flour' }, + { input: 'tfc:food/rye_grain', output: '2x tfc:food/rye_flour', name: 'rye_flour' }, + { input: 'tfc:food/rice_grain', output: '2x tfc:food/rice_flour', name: 'rice_flour' }, + { input: 'tfc:food/wheat_grain', output: '2x tfc:food/wheat_flour', name: 'wheat_flour' }, ]; global.calcAmountOfMetal = (defaultAmount, percents) => {