From 120d6e1c4379f0f5b5aefd180b2fa4ff9148c8a5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 9 Dec 2025 15:48:42 +0000 Subject: [PATCH] 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 --- .../tfc/drinkables/cocoa.json | 0 .../tfc/drinkables/coffee.json | 0 .../tfc/drinkables/compote.json | 0 .../tfc/drinkables/kvass.json | 0 .../tfc/drinkables/lemonade.json | 0 .../tfc/drinkables/nalivka.json | 0 .../tfc/drinkables/tea_chamomile.json | 0 .../tfc/drinkables/tea_mint.json | 0 .../tfc/drinkables/tea_nettle.json | 0 .../tfc/drinkables/tea_rosehip.json | 0 .../tfc/drinkables/aged_corn_whiskey.json | 0 .../tfc/drinkables/aged_rye_whiskey.json | 0 .../tfc/drinkables/aged_sake.json | 0 .../tfc/drinkables/aged_vodka.json | 0 .../tfc/drinkables/aged_whiskey.json | 0 kubejs/server_scripts/ad_astra/tags.js | 2 +- kubejs/server_scripts/tfc/tags.js | 21 ++++++++++--------- .../{tfcgurman => tfc_gurman}/recipes.js | 0 .../{hotornot => tfchotornot}/recipes.js | 0 .../{hotornot => tfchotornot}/tags.js | 2 ++ .../server_scripts/tfg/food/recipes.food.js | 2 +- .../tfg/powergen/recipes.biodiesel.js | 20 +++++++++--------- 22 files changed, 25 insertions(+), 22 deletions(-) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/cocoa.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/coffee.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/compote.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/kvass.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/lemonade.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/nalivka.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/tea_chamomile.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/tea_mint.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/tea_nettle.json (100%) rename kubejs/data/{tfc => tfc_gurman}/tfc/drinkables/tea_rosehip.json (100%) rename kubejs/data/{tfc => tfcagedalcohol}/tfc/drinkables/aged_corn_whiskey.json (100%) rename kubejs/data/{tfc => tfcagedalcohol}/tfc/drinkables/aged_rye_whiskey.json (100%) rename kubejs/data/{tfc => tfcagedalcohol}/tfc/drinkables/aged_sake.json (100%) rename kubejs/data/{tfc => tfcagedalcohol}/tfc/drinkables/aged_vodka.json (100%) rename kubejs/data/{tfc => tfcagedalcohol}/tfc/drinkables/aged_whiskey.json (100%) rename kubejs/server_scripts/{tfcgurman => tfc_gurman}/recipes.js (100%) rename kubejs/server_scripts/{hotornot => tfchotornot}/recipes.js (100%) rename kubejs/server_scripts/{hotornot => tfchotornot}/tags.js (91%) diff --git a/kubejs/data/tfc/tfc/drinkables/cocoa.json b/kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/cocoa.json rename to kubejs/data/tfc_gurman/tfc/drinkables/cocoa.json diff --git a/kubejs/data/tfc/tfc/drinkables/coffee.json b/kubejs/data/tfc_gurman/tfc/drinkables/coffee.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/coffee.json rename to kubejs/data/tfc_gurman/tfc/drinkables/coffee.json diff --git a/kubejs/data/tfc/tfc/drinkables/compote.json b/kubejs/data/tfc_gurman/tfc/drinkables/compote.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/compote.json rename to kubejs/data/tfc_gurman/tfc/drinkables/compote.json diff --git a/kubejs/data/tfc/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/kvass.json rename to kubejs/data/tfc_gurman/tfc/drinkables/kvass.json diff --git a/kubejs/data/tfc/tfc/drinkables/lemonade.json b/kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/lemonade.json rename to kubejs/data/tfc_gurman/tfc/drinkables/lemonade.json diff --git a/kubejs/data/tfc/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/nalivka.json rename to kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_chamomile.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_mint.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_nettle.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_nettle.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_nettle.json diff --git a/kubejs/data/tfc/tfc/drinkables/tea_rosehip.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/tea_rosehip.json rename to kubejs/data/tfc_gurman/tfc/drinkables/tea_rosehip.json diff --git a/kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/aged_corn_whiskey.json rename to kubejs/data/tfcagedalcohol/tfc/drinkables/aged_corn_whiskey.json diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/aged_rye_whiskey.json rename to kubejs/data/tfcagedalcohol/tfc/drinkables/aged_rye_whiskey.json diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/aged_sake.json rename to kubejs/data/tfcagedalcohol/tfc/drinkables/aged_sake.json diff --git a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/aged_vodka.json rename to kubejs/data/tfcagedalcohol/tfc/drinkables/aged_vodka.json diff --git a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json similarity index 100% rename from kubejs/data/tfc/tfc/drinkables/aged_whiskey.json rename to kubejs/data/tfcagedalcohol/tfc/drinkables/aged_whiskey.json diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index b6578ed62..a705ac40f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -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') diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 16edea41c..0c59df65c 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -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"); diff --git a/kubejs/server_scripts/tfcgurman/recipes.js b/kubejs/server_scripts/tfc_gurman/recipes.js similarity index 100% rename from kubejs/server_scripts/tfcgurman/recipes.js rename to kubejs/server_scripts/tfc_gurman/recipes.js diff --git a/kubejs/server_scripts/hotornot/recipes.js b/kubejs/server_scripts/tfchotornot/recipes.js similarity index 100% rename from kubejs/server_scripts/hotornot/recipes.js rename to kubejs/server_scripts/tfchotornot/recipes.js diff --git a/kubejs/server_scripts/hotornot/tags.js b/kubejs/server_scripts/tfchotornot/tags.js similarity index 91% rename from kubejs/server_scripts/hotornot/tags.js rename to kubejs/server_scripts/tfchotornot/tags.js index bcc28c7b6..2d5c2772c 100644 --- a/kubejs/server_scripts/hotornot/tags.js +++ b/kubejs/server_scripts/tfchotornot/tags.js @@ -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) => { diff --git a/kubejs/server_scripts/tfg/food/recipes.food.js b/kubejs/server_scripts/tfg/food/recipes.food.js index c99e8b67e..d20037ae2 100644 --- a/kubejs/server_scripts/tfg/food/recipes.food.js +++ b/kubejs/server_scripts/tfg/food/recipes.food.js @@ -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)] }) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js index f9eab5cf2..861184069 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.biodiesel.js @@ -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)