Revert "merge"
This commit is contained in:
Redeix
GitHub
parent
c211aed518
commit
2e5295614c
66 changed files with 898 additions and 1087 deletions
|
|
@ -69,7 +69,6 @@ const registerTFCHeats = (event) => {
|
|||
makeItemHeatByTagPrefix(TagPrefix.rodLong, material, tfcProperty, 1.429)
|
||||
|
||||
makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429)
|
||||
makeItemHeatByTagPrefix(TFGTagPrefix.ingotDouble, material, tfcProperty, 2.875)
|
||||
|
||||
makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429)
|
||||
makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429)
|
||||
|
|
|
|||
|
|
@ -34,6 +34,44 @@ const registerTFCRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Рецепты зерен
|
||||
|
||||
global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS.forEach(element => {
|
||||
|
||||
event.recipes.gtceu.macerator(`tfg:${element.name}`)
|
||||
.itemInputs(element.input)
|
||||
.itemOutputs(element.output)
|
||||
.chancedOutput('tfc:straw', 7000, 500)
|
||||
.duration(200)
|
||||
.EUt(2)
|
||||
|
||||
event.recipes.tfc.quern(element.output, element.input)
|
||||
.id(`tfg:quern/${element.name}`)
|
||||
})
|
||||
|
||||
//#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(2)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Рецепты обжарки мяса
|
||||
|
||||
global.TFC_FURNACE_MEAT_RECIPE_COMPONENTS.forEach(element => {
|
||||
event.smelting(element.output, element.input)
|
||||
.id(`tfg:smelting/${element.name}`)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Рецепты обжарки форм
|
||||
|
||||
global.TFC_FURNACE_MOLD_RECIPE_COMPONENTS.forEach(element => {
|
||||
|
|
@ -88,6 +126,15 @@ const registerTFCRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Рецепты хлеба
|
||||
|
||||
global.TFC_FURNACE_BREAD_RECIPE_COMPONENTS.forEach(element => {
|
||||
event.smelting(element.output, element.input)
|
||||
.id(`tfg:smelting/${element.name}`)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
event.shapeless('tfc:crucible', ['tfc:crucible']).id('tfg:empty_crucible')
|
||||
|
||||
event.shapeless('2x minecraft:stick', ['#minecraft:saplings', '#forge:tools/knives']).id('tfg:strip_saplings')
|
||||
|
|
|
|||
|
|
@ -117,6 +117,20 @@ function registerTFCMachineRecipes(event) {
|
|||
.duration(3200)
|
||||
.EUt(16)
|
||||
|
||||
//#region Рецепты плоского теста
|
||||
|
||||
global.TFC_MIXER_FLATBREAD_DOUGH_RECIPE_COMPONENTS.forEach(element => {
|
||||
event.recipes.gtceu.mixer(element.name)
|
||||
.itemInputs(element.input)
|
||||
.inputFluids(Fluid.of('minecraft:water', 100))
|
||||
.itemOutputs(element.output)
|
||||
.duration(300)
|
||||
.EUt(16)
|
||||
.circuit(3)
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Молды в ассемблере
|
||||
|
||||
for (let i = 0; i < global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS.length; i++) {
|
||||
|
|
@ -160,9 +174,158 @@ function registerTFCMachineRecipes(event) {
|
|||
.duration(2400)
|
||||
.EUt(16)
|
||||
|
||||
// Curdled milk
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_milk')
|
||||
.inputFluids(Fluid.of('minecraft:milk', 2000))
|
||||
.itemInputs('firmalife:rennet')
|
||||
.outputFluids(Fluid.of('tfc:curdled_milk', 2000))
|
||||
.duration(2400)
|
||||
.EUt(16)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_yak_milk')
|
||||
.inputFluids(Fluid.of('firmalife:yak_milk', 2000))
|
||||
.itemInputs('firmalife:rennet')
|
||||
.outputFluids(Fluid.of('firmalife:curdled_yak_milk', 2000))
|
||||
.duration(2400)
|
||||
.EUt(16)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/curdled_goat_milk')
|
||||
.inputFluids(Fluid.of('firmalife:goat_milk', 2000))
|
||||
.itemInputs('firmalife:rennet')
|
||||
.outputFluids(Fluid.of('firmalife:curdled_goat_milk', 2000))
|
||||
.duration(2400)
|
||||
.EUt(16)
|
||||
|
||||
//Curds
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/milk_curd')
|
||||
.inputFluids(Fluid.of('tfc:curdled_milk', 1000))
|
||||
.itemOutputs('firmalife:food/milk_curd')
|
||||
.duration(1200)
|
||||
.EUt(16)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/yak_curd')
|
||||
.inputFluids(Fluid.of('firmalife:curdled_yak_milk', 1000))
|
||||
.itemOutputs('firmalife:food/yak_curd')
|
||||
.duration(1200)
|
||||
.EUt(16)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/goat_curd')
|
||||
.inputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000))
|
||||
.itemOutputs('firmalife:food/goat_curd')
|
||||
.duration(1200)
|
||||
.EUt(16)
|
||||
|
||||
// Cheese wheels
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/gouda_wheel')
|
||||
.inputFluids(Fluid.of('tfc:salt_water', 750))
|
||||
.itemInputs('3x firmalife:food/milk_curd')
|
||||
.itemOutputs('firmalife:gouda_wheel')
|
||||
.duration(12000)
|
||||
.EUt(24)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/shosha_wheel')
|
||||
.inputFluids(Fluid.of('tfc:salt_water', 750))
|
||||
.itemInputs('3x firmalife:food/yak_curd')
|
||||
.itemOutputs('firmalife:shosha_wheel')
|
||||
.duration(12000)
|
||||
.EUt(24)
|
||||
|
||||
event.recipes.gtceu.fermenter('tfg:fermenter/feta_wheel')
|
||||
.inputFluids(Fluid.of('tfc:salt_water', 750))
|
||||
.itemInputs('3x firmalife:food/goat_curd')
|
||||
.itemOutputs('firmalife:feta_wheel')
|
||||
.duration(12000)
|
||||
.EUt(24)
|
||||
|
||||
// Cutting
|
||||
event.recipes.gtceu.cutter('tfg:cutter/gouda')
|
||||
.itemInputs('firmalife:gouda_wheel')
|
||||
.itemOutputs('4x firmalife:food/gouda')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
event.recipes.gtceu.cutter('tfg:cutter/shosha')
|
||||
.itemInputs('firmalife:shosha_wheel')
|
||||
.itemOutputs('4x firmalife:food/shosha')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
event.recipes.gtceu.cutter('tfg:cutter/feta')
|
||||
.itemInputs('firmalife:feta_wheel')
|
||||
.itemOutputs('4x firmalife:food/feta')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
event.recipes.gtceu.cutter('tfg:cutter/cheddar')
|
||||
.itemInputs('firmalife:cheddar_wheel')
|
||||
.itemOutputs('4x firmalife:food/cheddar')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
event.recipes.gtceu.cutter('tfg:cutter/chevre')
|
||||
.itemInputs('firmalife:chevre_wheel')
|
||||
.itemOutputs('4x firmalife:food/chevre')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
event.recipes.gtceu.cutter('tfg:cutter/rajya_metok')
|
||||
.itemInputs('firmalife:rajya_metok_wheel')
|
||||
.itemOutputs('4x firmalife:food/rajya_metok')
|
||||
.duration(40)
|
||||
.EUt(7)
|
||||
|
||||
// Misc
|
||||
global.TFC_MILKS.forEach(milk => {
|
||||
event.recipes.gtceu.fermenter(`tfg:fermenter/cream_from_${milk.id.replace(':', '_')}`)
|
||||
.inputFluids(Fluid.of(milk.id, 1000))
|
||||
.outputFluids(Fluid.of('firmalife:cream'))
|
||||
.circuit(6)
|
||||
.duration(1200)
|
||||
.EUt(24)
|
||||
})
|
||||
|
||||
event.recipes.gtceu.mixer('tfg:mixer/tomato_sauce')
|
||||
.itemInputs('firmalife:food/tomato_sauce_mix')
|
||||
.inputFluids(Fluid.of('minecraft:water', 200))
|
||||
.itemOutputs('firmalife:food/tomato_sauce')
|
||||
.duration(200)
|
||||
.EUt(24)
|
||||
|
||||
//#endregion
|
||||
|
||||
// Brine
|
||||
//#region Оливки
|
||||
|
||||
event.recipes.gtceu.macerator(`tfg:tfc/olive_paste`)
|
||||
.itemInputs('tfc:food/olive')
|
||||
.itemOutputs('2x tfc:olive_paste')
|
||||
.duration(60)
|
||||
.EUt(2)
|
||||
|
||||
event.recipes.gtceu.mixer('tfg:tfc/olive_oil_water')
|
||||
.inputFluids(Fluid.of('water', 200))
|
||||
.itemInputs('1x tfc:olive_paste')
|
||||
.outputFluids(Fluid.of('tfc:olive_oil_water', 200))
|
||||
.duration(200)
|
||||
.EUt(28)
|
||||
|
||||
event.recipes.gtceu.distillery('tfg:tfc/olive_oil')
|
||||
.inputFluids(Fluid.of('tfc:olive_oil_water', 250))
|
||||
.outputFluids(Fluid.of('tfc:olive_oil', 50))
|
||||
.duration(600)
|
||||
.EUt(28)
|
||||
|
||||
//#endregion
|
||||
|
||||
// Vinegar and Brine
|
||||
|
||||
global.TFC_ALCOHOL.forEach(alcohol => {
|
||||
event.recipes.gtceu.fermenter(`tfg:tfc/vinegar/${alcohol.id.replace(':', '_')}`)
|
||||
.itemInputs('#tfc:foods/fruits')
|
||||
.inputFluids(Fluid.of(alcohol.id, 250))
|
||||
.outputFluids(Fluid.of('tfc:vinegar', 250))
|
||||
.duration(600)
|
||||
.EUt(28)
|
||||
})
|
||||
|
||||
event.recipes.gtceu.mixer('tfg:tfc/brine')
|
||||
.inputFluids(Fluid.of('tfc:salt_water', 900))
|
||||
|
|
|
|||
|
|
@ -1114,15 +1114,6 @@ function registerTFCMaterialsRecipes(event) {
|
|||
let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`)
|
||||
|
||||
if (!tongsStack.isEmpty() && !tongPartStack.isEmpty()) {
|
||||
event.shaped(tongsStack, [
|
||||
'AA',
|
||||
'BC'
|
||||
], {
|
||||
A: tongPartStack,
|
||||
B: '#forge:bolts',
|
||||
C: '#forge:tools/hammers'
|
||||
}).id(`tfchotornot:crafting/tongs/${material.getName()}`)
|
||||
|
||||
// Ручка щипцов
|
||||
event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp())
|
||||
.resultFluid(Fluid.of(outputMaterial.getFluid(), 144))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue