illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'TerraFirmaGreg-Team:main' into patch-5

Browse source
This commit is contained in:
Pyritie 2025-01-05 17:28:38 +00:00 • committed by GitHub
commit 9d0e6f9bb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 53 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kubejs/server_scripts/firmalife/recipes.js
View file

@ -458,6 +458,30 @@ const registerFirmaLifeRecipes = (event) => {
event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)])
.id('firmalife:create/mixer/food/hardtack_dough')
// Yeast starter
event.recipes.gtceu.mixer('firmalife:yeast_starter')
.inputFluids(Fluid.of('firmalife:yeast_starter', 100))
.itemInputs('#tfc:foods/flour')
.outputFluids('firmalife:yeast_starter', 600)
.duration(1200)
.EUt(8)
event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)])
.id('firmalife:create/mixer/yeast_starter')
// Cocoa Powder
event.recipes.gtceu.macerator('firmalife:food/cocoa_powder')
.itemInputs('gtceu:cocoa_dust')
.itemOutputs('4x firmalife:food/cocoa_powder')
.duration(100)
.EUt(2)
event.recipes.createMilling('4x firmalife:food/cocoa_powder', 'gtceu:cocoa_dust')
.id('firmalife:milling/food/cocoa_dust')
event.recipes.tfc.quern('4x firmalife:food/cocoa_powder', 'gtceu:cocoa_dust')
.id(`tfg:quern/cocoa_powder`)
// Chocolate Ice Cream
event.recipes.gtceu.mixer('firmalife:food/chocolate_ice_cream')
.itemInputs('firmalife:food/vanilla_ice_cream')
@ -659,4 +683,4 @@ const registerFirmaLifeRecipes = (event) => {
}
});
}
}

27
kubejs/server_scripts/tfc/recipes.js
View file

@ -1286,8 +1286,8 @@ 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)
TFC.alloyPart('tfg:redstone', 0.75, 0.85),
TFC.alloyPart('tfc:copper', 0.15, 0.25)
]).id('tfg:alloy/red_alloy')
event.recipes.tfc.alloy('tfg:tin_alloy', [
@ -1554,6 +1554,26 @@ const registerTFCRecipes = (event) => {
//#endregion
//#region metal bars
const METAL_BARS = [
"copper",
"bronze",
"black_bronze",
"bismuth_bronze",
"wrought_iron",
"steel",
"black_steel",
"red_steel",
"blue_steel"
];
METAL_BARS.forEach(metal => {
generateCutterRecipe(event, `gtceu:${metal}_plate`, 9, `8x tfc:metal/bars/${metal}`, 100, 16, `${metal}_plate_to_bars`)
});
//#endregion
//#endregion
//#region Земля
@ -1699,6 +1719,7 @@ const registerTFCRecipes = (event) => {
event.recipes.gtceu.assembler(`tfg:tfc/${stone}_loose_to_brick`)
.itemInputs(`tfc:rock/loose/${stone}`)
.itemOutputs(`tfc:brick/${stone}`)
.circuit(1)
.duration(40)
.EUt(8)
@ -1788,7 +1809,7 @@ const registerTFCRecipes = (event) => {
event.recipes.gtceu.assembler(`${stone}_loose_rocks_to_cobble`)
.itemInputs(`4x tfc:rock/loose/${stone}`)
.circuit(0)
.circuit(2)
.inputFluids(Fluid.of('gtceu:concrete', 72))
.itemOutputs(`tfc:rock/cobble/${stone}`)
.duration(50)