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

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-11-15 00:21:41 +00:00
commit 0e806878b9
3 changed files with 126 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -892,4 +892,127 @@ const registerFirmaLifeRecipes = (event) => {
setChocolateHeating('white') setChocolateHeating('white')
setChocolateHeating('milk') setChocolateHeating('milk')
setChocolateHeating('dark') setChocolateHeating('dark')
//fixing the bread unrotting
event.remove({ id: 'firmalife:crafting/oat_slice'})
event.remove({ id: 'firmalife:crafting/wheat_slice'})
event.remove({ id: 'firmalife:crafting/barley_slice'})
event.remove({ id: 'firmalife:crafting/maize_slice'})
event.remove({ id: 'firmalife:crafting/rice_slice'})
event.remove({ id: 'firmalife:crafting/rye_slice'})
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/oat_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/oat_bread'), '#forge:tools/knives'], 'tfc:food/oat_bread')
.id(`tfg:crafting/oat_slice`)
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/wheat_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/wheat_bread'), '#forge:tools/knives'], 'tfc:food/wheat_bread')
.id(`tfg:crafting/wheat_slice`)
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/barley_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/barley_bread'), '#forge:tools/knives'], 'tfc:food/barley_bread')
.id(`tfg:crafting/barley_slice`)
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/maize_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/maize_bread'), '#forge:tools/knives'], 'tfc:food/maize_bread')
.id(`tfg:crafting/maize_slice`)
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/rice_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/rice_bread'), '#forge:tools/knives'], 'tfc:food/rice_bread')
.id(`tfg:crafting/rice_slice`)
event.recipes.tfc.advanced_shapeless_crafting(
TFC.itemStackProvider.of('2x firmalife:food/rye_slice').copyFood(),
[TFC.ingredient.notRotten('tfc:food/rye_bread'), '#forge:tools/knives'], 'tfc:food/rye_bread')
.id(`tfg:crafting/rye_slice`)
//fixing the cheese curd unrotting
event.remove({ id: 'firmalife:crafting/cheddar_wheel'})
event.remove({ id: 'firmalife:crafting/chevre_wheel'})
event.remove({ id: 'firmalife:crafting/rajya_metok_wheel'})
event.remove({ id: 'firmalife:barrel/gouda'})
event.remove({ id: 'firmalife:barrel/feta'})
event.remove({ id: 'firmalife:barrel/shosha'})
event.recipes.tfc.advanced_shaped_crafting(
TFC.itemStackProvider.of('firmalife:cheddar_wheel').copyFood(), [
'AAA',
'BBB',
'AAA'
], {
A: 'tfc:powder/salt',
B: TFC.ingredient.notRotten('firmalife:food/milk_curd')
}, 0, 0).id('tfg:crafting/cheddar_wheel')
event.recipes.tfc.advanced_shaped_crafting(
TFC.itemStackProvider.of('firmalife:chevre_wheel').copyFood(), [
'AAA',
'BBB',
'AAA'
], {
A: 'tfc:powder/salt',
B: TFC.ingredient.notRotten('firmalife:food/goat_curd')
}, 0, 0).id('tfg:crafting/chevre_wheel')
event.recipes.tfc.advanced_shaped_crafting(
TFC.itemStackProvider.of('firmalife:rajya_metok_wheel').copyFood(), [
'AAA',
'BBB',
'AAA'
], {
A: 'tfc:powder/salt',
B: TFC.ingredient.notRotten('firmalife:food/yak_curd')
}, 0, 0).id('tfg:crafting/rajya_metok_wheel')
event.custom({
"type": "tfc:barrel_sealed",
"input_item": {
"count": 3,
"ingredient": {
"type": "tfc:not_rotten",
"ingredient": { "item": "firmalife:food/milk_curd" }
}
},
"input_fluid": {
"ingredient": "tfc:salt_water",
"amount": 750
},
"output_item": {
"item": "firmalife:gouda_wheel"
},
"duration": 16000
}).id('tfg:barrel/gouda_wheel')
event.custom({
"type": "tfc:barrel_sealed",
"input_item": {
"count": 3,
"ingredient": {
"type": "tfc:not_rotten",
"ingredient": { "item": "firmalife:food/goat_curd" }
}
},
"input_fluid": {
"ingredient": "tfc:salt_water",
"amount": 750
},
"output_item": {
"item": "firmalife:feta_wheel"
},
"duration": 16000
}).id('tfg:barrel/feta_wheel')
event.custom({
"type": "tfc:barrel_sealed",
"input_item": {
"count": 3,
"ingredient": {
"type": "tfc:not_rotten",
"ingredient": { "item": "firmalife:food/yak_curd" }
}
},
"input_fluid": {
"ingredient": "tfc:salt_water",
"amount": 750
},
"output_item": {
"item": "firmalife:shosha_wheel"
},
"duration": 16000
}).id('tfg:barrel/shosha_wheel')
} }

2
kubejs/server_scripts/minecraft/tags.js
View file

@ -100,6 +100,8 @@ const registerMinecraftItemTags = (event) => {
event.add('forge:smooth_stone_slab', 'minecraft:polished_deepslate_slab') event.add('forge:smooth_stone_slab', 'minecraft:polished_deepslate_slab')
event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_slab') event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_slab')
event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_brick_slab') event.add('forge:smooth_stone_slab', 'minecraft:polished_blackstone_brick_slab')
event.add('tfc:rock/smooth', 'minecraft:smooth_stone')
} }
const registerMinecraftBlockTags = (event) => { const registerMinecraftBlockTags = (event) => {

2
kubejs/server_scripts/tfg/data.js
View file

@ -78,7 +78,7 @@ function registerTFGItemSize(event) {
event.itemSize("tfg:trowel", "large", "medium", "trowel"); event.itemSize("tfg:trowel", "large", "medium", "trowel");
event.itemSize("tfg:railgun_ammo_shell", "large", "heavy", "trowel"); event.itemSize("tfg:railgun_ammo_shell", "large", "medium", "railgun_ammo_shell");
event.itemSize("tfg:harvest_basket", "large", "medium", "harvest_basket"); event.itemSize("tfg:harvest_basket", "large", "medium", "harvest_basket");
event.itemSize("tfg:aluminium_harvest_basket", "large", "medium", "aluminium_harvest_basket"); event.itemSize("tfg:aluminium_harvest_basket", "large", "medium", "aluminium_harvest_basket");