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

Merge branch 'main' into 143-integration-computercraft

Browse source
This commit is contained in:
Cube 2024-01-05 23:25:25 +02:00 • committed by GitHub
commit 1f80d23b6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 565 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kubejs/server_scripts/chisel_and_bits/recipes.js
View file

@ -58,7 +58,7 @@ const registerChiselAndBitsRecipes = (event) => {
// Герметик
event.shapeless('chiselsandbits:sealant', [
'minecraft:slimeball',
'minecraft:slime_ball',
'firmalife:raw_honey'
]).id('tfg:chiselsandbits/shapeless/sealant_from_slimeballs')

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

@ -8,10 +8,11 @@ const registerTFCRecipes = (event) => {
let metal = keyValuePair[0]
let metalSpecs = keyValuePair[1]
if (metalSpecs.props.includes(global.INGOT_GEN)) {
if (metalSpecs.input_fluid != undefined) {
// Отливка слитка в обычной форме
event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(metalSpecs.input_fluid, 144), 0.1)
.id(`tfc:casting/${metal}_ingot`)
@ -20,6 +21,16 @@ const registerTFCRecipes = (event) => {
event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.input_fluid, 144), 0.01)
.id(`tfc:casting/${metal}_fire_ingot`)
}
else
{
// Отливка слитка в обычной форме
event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/ingot_mold', TFC.fluidStackIngredient(metalSpecs.output_fluid, 144), 0.1)
.id(`tfc:casting/${metal}_ingot`)
// Отливка слитка в огнеупорной форме
event.recipes.tfc.casting(Item.of(`#forge:ingots/${metal}`), 'tfc:ceramic/fire_ingot_mold', TFC.fluidStackIngredient(metalSpecs.output_fluid, 144), 0.01)
.id(`tfc:casting/${metal}_fire_ingot`)
}
// Декрафт слитка в жидкость
event.recipes.tfc.heating(`#forge:ingots/${metal}`, metalSpecs.melt_temp)
@ -2509,9 +2520,9 @@ const registerTFCRecipes = (event) => {
//#region Обрушения
event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_slabs'])).id('tfg:collapse/rock_slabs')
event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_stairs'])).id('tfg:collapse/rock_stairs')
event.recipes.tfc.collapse(null, TFC.blockIngredient(['#tfg:rock_walls'])).id('tfg:collapse/rock_walls')
event.recipes.tfc.collapse('#tfg:rock_slabs').id('tfg:collapse/rock_slabs')
event.recipes.tfc.collapse('#tfg:rock_stairs').id('tfg:collapse/rock_stairs')
event.recipes.tfc.collapse('#tfg:rock_walls').id('tfg:collapse/rock_walls')
global.TFC_STONE_TYPES.forEach(stoneType => {
let oresToCollapse = []