From 36a9dc5099373b1a8bb40cdb0747670bf1366e75 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 20 Jan 2026 11:38:46 +0000 Subject: [PATCH] add anthracite as boiler fuel, add more items to the grain tag for soups #2785 --- CHANGELOG.md | 3 +++ kubejs/server_scripts/beneath/tags.js | 2 +- kubejs/server_scripts/tfc/tags.js | 8 ++++++++ .../tfg/powergen/recipes.boiler.js | 19 +++++++++++++++++++ kubejs/startup_scripts/firmalife/constants.js | 8 +++++++- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a9a760ef..32e41a270 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,8 @@ - Cleaned up hanging sign recipes so they don't spam as much (#2733, #2771) @Inceitious - Added recipes to change AE2 glass cables into covered/smart cables, and changed some recipes to require smart cables instead (#2756) @awfulworldkid - Crop, tree tap, and beehive tooltips, and the climate tab, now show the accurate current temperature when in an oxygenated area @Mqrius +- Anthracite can now be used as boiler fuel with the same duration as Coke @Pyritie +- Added more grain options for soup (#2785) @Pyritie ### Bug fixes - Fixed not being able to craft Paracetamol or Rad-Away @Pyritie - Fixed the missing dried fruit to yeast starter recipe (#2673) @Mqrius @@ -70,6 +72,7 @@ - Fixed casting of rods and gears for various metals @Pyritie - Fixed a dupe with scraping knives (#2716) @Inceitious - Fixed a rendering issue with the lunchboxes when held @Thomasx0 +- Fixed the lunchbox eating particles so now they look like the food being eaten @Thomasx0 - Fixed the cooling lunchbox not stacking empty cells correctly (#2475) @Thomasx0 - Fixed the lunchboxes not removing the "cooling" trait when items were removed with the number keys @Thomasx0 - Digger helmet crafting now correctly consumes the cloth hat (#2770) @Inceitious diff --git a/kubejs/server_scripts/beneath/tags.js b/kubejs/server_scripts/beneath/tags.js index ab0397f98..9ea5bed0e 100644 --- a/kubejs/server_scripts/beneath/tags.js +++ b/kubejs/server_scripts/beneath/tags.js @@ -39,7 +39,7 @@ const registerBeneathItemTags = (event) => { event.add("tfg:rubber_plants", "beneath:gleamflower") event.add("tfg:rubber_plants", "beneath:burpflower") - event.add("tfg:rubber_plants", "beneath:fools_funnel") + event.add("tfg:rubber_plants", "beneath:food/fools_funnel") } const registerBeneathBlockTags = (event) => { diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 595c83b78..752edea62 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -157,6 +157,14 @@ function registerTFCItemTags(event) { event.add("minecraft:fishes", "tfc:food/rainbow_trout"); event.add("minecraft:fishes", "tfc:food/smallmouth_bass"); + event.add("tfc:foods/grains", "tfc:food/cooked_rice"); + event.add("tfc:foods/grains", "tfc:food/cattail_root"); + event.add("tfc:foods/grains", "tfc:food/taro_root"); + event.add("tfc:foods/grains", "firmalife:food/tortilla_chips"); + event.add("tfc:foods/grains", "firmalife:food/cooked_rice_noodles"); + event.add("tfc:foods/grains", "firmalife:food/cooked_pasta"); + event.add("tfc:foods/grains", "firmalife:food/toast"); + // Чтобы жарились бревна из TFC в пиролиз. печке // Почему нельзя просто добавить тег в тег? (допустим minecraft:logs), потому что из-за этого ломаются все рецепты minecraft:logs, магия... global.TFC_WOOD_TYPES.forEach((woodType) => { diff --git a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js index 81e6b8be0..0ca747411 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js @@ -49,21 +49,31 @@ function registerTFGBoilerRecipes(event) { .itemInputs('#minecraft:logs') .duration(300) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:saplings') .itemInputs('#minecraft:saplings') .duration(100) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:planks') .itemInputs('#minecraft:planks') .duration(75) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') + + event.recipes.gtceu.steam_boiler('tfg:anthracite') + .itemInputs('beneath:cursecoal') + .duration(160 * 20) + .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:flora_pellets') .itemInputs('tfg:flora_pellets') .duration(1200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') // Small nerf to charcoal @@ -82,48 +92,57 @@ function registerTFGBoilerRecipes(event) { .inputFluids(Fluid.of('gtceu:oil', 200)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:heavy_oil') .inputFluids(Fluid.of('gtceu:oil_heavy', 32)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:fish_oil') .inputFluids(Fluid.of('gtceu:fish_oil', 160)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') // These aren't in base GT, but they have the same stats as oil event.recipes.gtceu.steam_boiler('tfg:raw_oil') .inputFluids(Fluid.of('gtceu:oil_medium', 200)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:light_oil') .inputFluids(Fluid.of('gtceu:oil_light', 200)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') // Same stats as fish oil event.recipes.gtceu.steam_boiler('tfg:olive_oil') .inputFluids(Fluid.of('tfc:olive_oil', 160)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:seed_oil') .inputFluids(Fluid.of('gtceu:seed_oil', 160)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:soybean_oil') .inputFluids(Fluid.of('firmalife:soybean_oil', 160)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') event.recipes.gtceu.steam_boiler('tfg:tallow') .inputFluids(Fluid.of('tfc:tallow', 160)) .duration(200) .dimension('minecraft:overworld') + .dimension('minecraft:the_nether') // fish oil extraction event.recipes.gtceu.extractor(`tfg:fish_oil`) diff --git a/kubejs/startup_scripts/firmalife/constants.js b/kubejs/startup_scripts/firmalife/constants.js index db7e6b48f..f6ae1a013 100644 --- a/kubejs/startup_scripts/firmalife/constants.js +++ b/kubejs/startup_scripts/firmalife/constants.js @@ -38,7 +38,13 @@ global.FIRMALIFE_DISABLED_ITEMS = [ 'firmalife:bucket/chocolate', 'firmalife:bucket/fruity_fluid', 'firmalife:bucket/metal/chromium', - 'firmalife:bucket/metal/stainless_steel' + 'firmalife:bucket/metal/stainless_steel', + + // Unimplemented + 'firmalife:food/frothy_coconut', + 'firmalife:cinnamon_bark', + 'firmalife:spice/cinnamon', + 'firmalife:spice/ground_cinnamon' ]; global.FIRMALIFE_HIDED_ITEMS = [