moved drinkable data to the right namespaces, renamed tfcgurman server script dir -> tfc_gurman, moved all alcohols to #tfg:alcohols instead of #tfc:alcohols, because agedalcohols is very fussy

This commit is contained in:
Pyritie 2025-12-09 15:48:42 +00:00
parent 0db5dd7267
commit 120d6e1c43
22 changed files with 25 additions and 22 deletions

View file

@ -31,7 +31,7 @@ const registerAdAstraFluidTags = (event) => {
event.add('ad_astra:freezes_in_space', 'tfc:spring_water')
event.add('ad_astra:evaporates_in_space', 'tfc:salt_water')
event.add('ad_astra:evaporates_in_space', 'tfc:spring_water')
event.add('ad_astra:evaporates_in_space', '#tfc:alcohols')
event.add('ad_astra:evaporates_in_space', '#tfg:alcohols')
event.add('ad_astra:evaporates_in_space', '#tfc:milks')
event.add('ad_astra:evaporates_in_space', '#tfc:dyes')
event.add('ad_astra:evaporates_in_space', '#tfc:drinkables')

View file

@ -671,16 +671,17 @@ function registerTFCFluidTags(event) {
event.add("tfc:ingredients", "tfc:spring_water");
event.add('tfc:drinkables', 'tfc:spring_water')
event.add("tfc:alcohols", "tfcagedalcohol:aged_beer");
event.add("tfc:alcohols", "tfcagedalcohol:aged_cider");
event.add("tfc:alcohols", "tfcagedalcohol:aged_rum");
event.add("tfc:alcohols", "tfcagedalcohol:aged_sake");
event.add("tfc:alcohols", "tfcagedalcohol:aged_vodka");
event.add("tfc:alcohols", "tfcagedalcohol:aged_whiskey");
event.add("tfc:alcohols", "tfcagedalcohol:aged_corn_whiskey");
event.add("tfc:alcohols", "tfcagedalcohol:aged_rye_whiskey");
event.add("tfc:alcohols", "tfcagedalcohol:aged_mead");
event.add("tfc:alcohols", "tfc_gurman:nalivka");
event.add('tfg:alcohols', '#tfc:alcohols')
event.add("tfg:alcohols", "tfcagedalcohol:aged_beer");
event.add("tfg:alcohols", "tfcagedalcohol:aged_cider");
event.add("tfg:alcohols", "tfcagedalcohol:aged_rum");
event.add("tfg:alcohols", "tfcagedalcohol:aged_sake");
event.add("tfg:alcohols", "tfcagedalcohol:aged_vodka");
event.add("tfg:alcohols", "tfcagedalcohol:aged_whiskey");
event.add("tfg:alcohols", "tfcagedalcohol:aged_corn_whiskey");
event.add("tfg:alcohols", "tfcagedalcohol:aged_rye_whiskey");
event.add("tfg:alcohols", "tfcagedalcohol:aged_mead");
event.add("tfg:alcohols", "tfc_gurman:nalivka");
// Добавляем тег для скрытия в EMI
event.add("c:hidden_from_recipe_viewers", "tfc:metal/bismuth");

View file

@ -12,6 +12,8 @@ const registerHotOrNotItemTags = (event) => {
event.add('tfchotornot:hot_whitelist', '#forge:hot_ingots')
event.add('firmalife:usable_on_oven', '#tfchotornot:insulating')
event.add('tfg:insulating_container', 'gtceu:ulv_super_tank')
}
const registerHotOrNotBlockTags = (event) => {

View file

@ -680,7 +680,7 @@ function registerTFGFoodRecipes(event) {
processorRecipe('vinegar_alcohol', 600, GTValues.VA[GTValues.LV], {
circuit: 5,
itemInputs: ['#tfc:foods/fruits'],
fluidInputs: ['#tfc:alcohols 250'],
fluidInputs: ['#tfg:alcohols 250'],
fluidOutputs: [Fluid.of('tfc:vinegar', 250)]
})

View file

@ -5,7 +5,7 @@ function registerTFGBiodieselRecipes(event) {
// Biofuels
event.recipes.gtceu.chemical_reactor(`seed_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:seed_oil', 6000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:seed_oil', 6000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
@ -13,14 +13,14 @@ function registerTFGBiodieselRecipes(event) {
// So you can craft Biodiesel without Chemical Reactor
event.recipes.gtceu.mixer(`tfg:seed_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:seed_oil', 1000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:seed_oil', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`olive_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:olive_oil', 4000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:olive_oil', 4000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
@ -28,14 +28,14 @@ function registerTFGBiodieselRecipes(event) {
// So you can craft Biodiesel without Chemical Reactor
event.recipes.gtceu.mixer(`tfg:olive_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:olive_oil', 1000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:olive_oil', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`soybean_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('firmalife:soybean_oil', 4000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('firmalife:soybean_oil', 4000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
@ -43,21 +43,21 @@ function registerTFGBiodieselRecipes(event) {
// So you can craft Biodiesel without Chemical Reactor
event.recipes.gtceu.mixer(`tfg:soybean_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('firmalife:soybean_oil', 1000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('firmalife:soybean_oil', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`fish_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:fish_oil', 6000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:fish_oil', 6000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
.EUt(GTValues.VHA[GTValues.ULV])
event.recipes.gtceu.chemical_reactor(`tallow_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 6000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:tallow', 6000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 6000))
.duration(20 * 10)
@ -66,7 +66,7 @@ function registerTFGBiodieselRecipes(event) {
// So you can craft Biodiesel without Chemical Reactor
event.recipes.gtceu.mixer(`tfg:fish_oil_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('gtceu:fish_oil', 1000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('gtceu:fish_oil', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)
@ -74,7 +74,7 @@ function registerTFGBiodieselRecipes(event) {
event.recipes.gtceu.mixer(`tfg:tallow_alcohol_biodiesel`)
.inputFluids("#tfc:alcohols 1000", Fluid.of('tfc:tallow', 1000))
.inputFluids("#tfg:alcohols 1000", Fluid.of('tfc:tallow', 1000))
.itemInputs('#forge:tiny_dusts/sodium_hydroxide')
.outputFluids(Fluid.of('gtceu:bio_diesel', 500))
.duration(20 * 10)