some recipes

This commit is contained in:
Dmitry
2024-01-10 12:16:47 +07:00
parent 94bf85633d
commit 58724af628
6 changed files with 225 additions and 31 deletions

View File

@@ -688,12 +688,12 @@ const registerCreateRecipes = (event) => {
], {
A: '#forge:chests/wooden',
B: '#forge:sheets/wrought_iron',
C: '#forge:screw/steel',
C: '#forge:screws/steel',
D: '#forge:tools/screwdrivers'
}).id('tfg:create/shaped/item_vault')
event.recipes.gtceu.assembler('tfg:create/item_vault')
.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screw/steel')
.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/steel')
.circuit(3)
.itemOutputs('create:item_vault')
.duration(200)

View File

@@ -1052,6 +1052,16 @@ const registerGTCEURecipes = (event) => {
event.remove({id: 'gtceu:smelting/fireclay_brick'})
event.remove({id: 'gtceu:macerator/macerate_firebrick'})
// Деревянная шестерня
event.shaped('gtceu:wood_gear', [
' A ',
'ABA',
' A '
], {
A: '#tfc:can_be_lit_on_torch',
B: '#forge:tools/wrenches'
}).id('gtceu:shaped/gear_wood')
// Контроллер теплицы
event.shaped('gtceu:greenhouse', [
'ABA',
@@ -1335,7 +1345,7 @@ const registerGTCEURecipes = (event) => {
}).id(`tfg:ae_transform/${material}_purified_ore`)
}
if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != 'wood')
if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && (material != 'wood' || material != 'treated_wood'))
{
if (material.hasProperty(PropertyKey.INGOT))
{

View File

@@ -33,6 +33,10 @@ const registerTFCMetals = (event) => {
event.metal('gtceu:black_steel', 1485, 0.00857, '#forge:ingots/black_steel', '#forge:double_ingots/black_steel', '#forge:plates/black_steel', 5, 'tfc:black_steel')
event.metal('gtceu:blue_steel', 1540, 0.00857, '#forge:ingots/blue_steel', '#forge:double_ingots/blue_steel', '#forge:plates/blue_steel', 6, 'tfc:blue_steel')
event.metal('gtceu:red_steel', 1540, 0.00857, '#forge:ingots/red_steel', '#forge:double_ingots/red_steel', '#forge:plates/red_steel', 6, 'tfc:red_steel')
event.metal('gtceu:redstone', 460, 0.01729, null, null, null, 1, 'tfg:redstone')
event.metal('gtceu:red_alloy', 740, 0.01529, '#forge:ingots/red_alloy', null, '#forge:plates/red_alloy', 2, 'tfg:red_alloy')
event.metal('gtceu:tin_alloy', 1250, 0.00829, '#forge:ingots/tin_alloy', null, '#forge:plates/tin_alloy', 3, 'tfg:tin_alloy')
}
const registerTFCHeats = (event) => {

View File

@@ -43,6 +43,11 @@ const registerTFCRecipes = (event) => {
event.recipes.tfc.heating(`tfc:metal/double_ingot/${metal}`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
.id(`tfc:heating/metal/${metal}_double_ingot`)
// Двойной слиток -> Пластина
event.recipes.tfc.anvil(`gtceu:${metal}_plate`, `tfc:metal/double_ingot/${metal}`, ['hit_last', 'hit_second_last', 'hit_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_sheet`)
}
if (metalSpecs.props.includes(global.PART_GEN)) {
@@ -57,41 +62,63 @@ const registerTFCRecipes = (event) => {
// Удалание рецептов полублоков
event.remove({ id: `tfc:crafting/metal/block/${metal}_slab` })
event.remove({ id: `tfc:heating/metal/${metal}_block_slab` })
}
if (metalSpecs.props.includes(global.BLOCK_GEN)) {
// Декрафт блока в жидкость
event.recipes.tfc.heating(`#forge:storage_blocks/${metal}`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 1296))
.id(`tfc:heating/metal/${metal}_block`)
}
if (metalSpecs.props.includes(global.ROD_GEN)) {
// Слиток -> 2 Стержня
event.recipes.tfc.anvil(`2x gtceu:${metal}_rod`, `#forge:ingots/${metal}`, ['bend_last', 'draw_second_last', 'draw_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_rod`)
// Декрафт стержня в жидкость
event.recipes.tfc.heating(`gtceu:${metal}_rod`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 72))
.id(`tfc:heating/metal/${metal}_rod`)
// Двойной слиток -> Пластина
event.recipes.tfc.anvil(`gtceu:${metal}_plate`, `tfc:metal/double_ingot/${metal}`, ['hit_last', 'hit_second_last', 'hit_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_sheet`)
let long_rod = Item.of(`gtceu:${metal}_long_rod`);
if (!long_rod.isEmpty()) {
// Декрафт длинного стержня в жидкость
event.recipes.tfc.heating(`gtceu:${metal}_long_rod`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 144))
.id(`tfc:heating/metal/${metal}_long_rod`)
// Стержни -> Длинный стержень
event.recipes.tfc.welding(`gtceu:${metal}_long_rod`, `#forge:rods/${metal}`, `#forge:rods/${metal}`)
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_long_rod`)
}
}
if (metalSpecs.props.includes(global.PLATE_GEN)) {
// Декрафт пластины в жидкость
event.recipes.tfc.heating(`gtceu:${metal}_plate`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 144))
.id(`tfc:heating/metal/${metal}_sheet`)
}
// Две пластины -> Двойная пластина
event.recipes.tfc.welding(`gtceu:${metal}_double_plate`, `gtceu:${metal}_plate`, `gtceu:${metal}_plate`)
.tier(metalSpecs.tier)
.id(`tfc:welding/${metal}_double_sheet`)
if (metalSpecs.props.includes(global.DOUBLE_PLATE_GEN)) {
let double_plate = Item.of(`gtceu:${metal}_double_plate`)
// Слиток -> 2 Стержня
event.recipes.tfc.anvil(`2x gtceu:${metal}_rod`, `#forge:ingots/${metal}`, ['bend_last', 'draw_second_last', 'draw_third_last'])
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_rod`)
if (!double_plate.isEmpty()) {
// Декрафт двойных пластин
event.recipes.tfc.heating(`gtceu:${metal}_double_plate`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
.id(`tfc:heating/metal/${metal}_double_sheet`)
// Декрафт двойных пластин
event.recipes.tfc.heating(`gtceu:${metal}_double_plate`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
.id(`tfc:heating/metal/${metal}_double_sheet`)
// Две пластины -> Двойная пластина
event.recipes.tfc.welding(`gtceu:${metal}_double_plate`, `gtceu:${metal}_plate`, `gtceu:${metal}_plate`)
.tier(metalSpecs.tier)
.id(`tfc:welding/${metal}_double_sheet`)
}
}
if (metalSpecs.props.includes(global.ARMOR_GEN)) {
@@ -206,16 +233,6 @@ const registerTFCRecipes = (event) => {
// Стержень -> Кольцо
// Возможно, когда нибудь, когда они пригодятся
// Длинный стержень -> Металл
event.recipes.tfc.heating(`gtceu:${metal}_long_rod`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 144))
.id(`tfc:heating/metal/${metal}_long_rod`)
// Стержни -> Длинный стержень
event.recipes.tfc.welding(`gtceu:${metal}_long_rod`, `#forge:rods/${metal}`, `#forge:rods/${metal}`)
.tier(metalSpecs.tier)
.id(`tfc:anvil/${metal}_long_rod`)
// Болт -> Металл
event.recipes.tfc.heating(`gtceu:${metal}_bolt`, metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, 36))
@@ -848,7 +865,8 @@ const registerTFCRecipes = (event) => {
.id(`tfg:heating/small_dust/${metal}`)
// Декрафт пыли
event.recipes.tfc.heating(`gtceu:${metal}_dust`, metalSpecs.melt_temp)
console.log(metal)
event.recipes.tfc.heating(Item.of(`#forge:dusts/${metal}`), metalSpecs.melt_temp)
.resultFluid(Fluid.of(metalSpecs.output_fluid, global.calcAmountOfMetal(144, metalSpecs.percent_of_material)))
.id(`tfg:heating/dust/${metal}`)
}
@@ -879,6 +897,20 @@ const registerTFCRecipes = (event) => {
})
//#region Новые рецепты сплавов
event.recipes.tfc.alloy('tfg:red_alloy', [
TFC.alloyPart('tfg:redstone', 0.15, 0.25),
TFC.alloyPart('tfc:copper', 0.75, 0.85)
]).id('tfg:alloy/red_alloy')
event.recipes.tfc.alloy('tfg:tin_alloy', [
TFC.alloyPart('tfc:tin', 0.45, 0.55),
TFC.alloyPart('tfc:cast_iron', 0.45, 0.55)
]).id('tfg:alloy/tin_alloy')
//#endregion
//#region Фиксы рецептов предметов из Cast Iron
//#region Удаление

View File

@@ -228,6 +228,9 @@ const registerTFCFluidTags = (event) => {
event.add('tfc:usable_in_ingot_mold', "gtceu:blue_steel")
event.add('tfc:usable_in_ingot_mold', "gtceu:red_steel")
event.add('tfc:usable_in_ingot_mold', "gtceu:red_alloy")
event.add('tfc:usable_in_ingot_mold', "gtceu:tin_alloy")
event.add('tfc:usable_in_bell_mold', "gtceu:bronze")
event.add('tfc:usable_in_bell_mold', "gtceu:gold")
event.add('tfc:usable_in_bell_mold', "gtceu:brass")

View File

@@ -784,10 +784,30 @@ global.DUST_GEN = 'dusts';
global.ORE_CHUNKS_GEN = 'ore_chunks';
/**
* Указывает, что у этого металла есть: sheet, double_sheet, rod, block, block_stairs, block_slab.
* Указывает, что у этого металла есть: plated_block, block_stairs, block_slab.
*/
global.PART_GEN = 'part';
/**
* Указывает, что у этого металла есть: block.
*/
global.BLOCK_GEN = 'block';
/**
* Указывает, что у этого металла есть: rod.
*/
global.ROD_GEN = 'rod';
/**
* Указывает, что у этого металла есть: sheet.
*/
global.PLATE_GEN = 'plate';
/**
* Указывает, что у этого металла есть: double_sheet.
*/
global.DOUBLE_PLATE_GEN = 'double_plate';
/**
* Указывает, что у этого металла есть: anvil, bars, chain, trapdoor, lamp, unfinished_lamp.
*/
@@ -844,6 +864,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -868,6 +892,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -890,6 +918,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -912,6 +944,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -935,6 +971,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -958,6 +998,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -979,6 +1023,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -1000,6 +1048,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -1023,6 +1075,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.ARMOR_GEN,
global.TOOL_GEN,
global.UTILITY_GEN,
@@ -1111,6 +1167,10 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.TFC_SMALL_NATIVE_ORE_GEN
]
},
@@ -1130,6 +1190,10 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1148,6 +1212,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1167,6 +1235,10 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1185,6 +1257,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1204,6 +1280,10 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.TFC_SMALL_NATIVE_ORE_GEN,
global.IS_GT_DUP,
@@ -1224,6 +1304,10 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1242,6 +1326,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1260,6 +1348,10 @@ global.METAL_TO_SPECS = {
global.NUGGET_GEN,
global.DUST_GEN,
global.PART_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN,
global.IS_GT_DUP,
]
@@ -1464,6 +1556,59 @@ global.METAL_TO_SPECS = {
global.DUST_GEN,
global.ORE_CHUNKS_GEN
],
},
// GT материалы
redstone: {
forging_temp: 240,
welding_temp: 320,
melt_temp: 460,
output_fluid: "gtceu:redstone",
percent_of_material: 100,
tier: 1,
props: [
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.BLOCK_GEN,
global.ORE_CHUNKS_GEN
],
},
red_alloy: {
forging_temp: 570,
welding_temp: 650,
melt_temp: 740,
output_fluid: "gtceu:red_alloy",
percent_of_material: 100,
tier: 2,
props: [
global.NUGGET_GEN,
global.INGOT_GEN,
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN
],
},
tin_alloy: {
forging_temp: 1000,
welding_temp: 1100,
melt_temp: 1250,
output_fluid: "gtceu:tin_alloy",
percent_of_material: 100,
tier: 3,
props: [
global.NUGGET_GEN,
global.INGOT_GEN,
global.DUST_GEN,
global.PLATE_GEN,
global.DOUBLE_PLATE_GEN,
global.ROD_GEN,
global.BLOCK_GEN
],
}
};