From 1cbc03c01668c223f4e759c6d3659f011ea8da43 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 26 Jan 2024 17:05:09 +0700 Subject: [PATCH] restore fluid hiding --- kubejs/server_scripts/create/tags.js | 7 ++- .../server_scripts/create_additions/tags.js | 9 ++- kubejs/server_scripts/firmalife/tags.js | 12 ++-- kubejs/server_scripts/main_server_script.js | 16 ++--- kubejs/server_scripts/more_red/tags.js | 2 +- kubejs/server_scripts/tfc/tags.js | 61 ++++++++++--------- kubejs/server_scripts/treetap/recipes.js | 2 +- 7 files changed, 61 insertions(+), 48 deletions(-) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 343015087..e3225c1d9 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -33,9 +33,12 @@ const registerCreateBlockTags = (event) => { const registerCreateFluidTags = (event) => { + + // Делаем воду из TFC бесконечной для помпы Create event.add('create:bottomless/allow', 'tfc:fresh_water') event.add('create:bottomless/allow', 'tfc:salt_water') - //event.hide('create:chocolate') - //event.hide('create:honey') + // Добавляем тег для скрытия в EMI + event.add('c:hidden_from_recipe_viewers', 'create:chocolate') + event.add('c:hidden_from_recipe_viewers', 'create:honey') } \ No newline at end of file diff --git a/kubejs/server_scripts/create_additions/tags.js b/kubejs/server_scripts/create_additions/tags.js index a2487bc41..bb4faf4ba 100644 --- a/kubejs/server_scripts/create_additions/tags.js +++ b/kubejs/server_scripts/create_additions/tags.js @@ -18,6 +18,9 @@ const registerCreateAdditionsBlockTags = (event) => { }) } - -//event.hide('createaddition:seed_oil') -//event.hide('createaddition:bioethanol') \ No newline at end of file +const registerCreateAdditionsFluidTags = (event) => { + + // Добавляем тег для скрытия в EMI + event.add('c:hidden_from_recipe_viewers', 'createaddition:seed_oil') + event.add('c:hidden_from_recipe_viewers', 'createaddition:bioethanol') +} \ No newline at end of file diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index fd26cab16..49e685f98 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -28,10 +28,14 @@ const registerFirmaLifeBlockTags = (event) => { event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } +const registerFirmaLifeFluidTags = (event) => { + + // Добавляем тег для скрытия в EMI + event.add('c:hidden_from_recipe_viewers', 'firmalife:metal/chromium') + event.add('c:hidden_from_recipe_viewers', 'create:honey') +} + const registerFirmaLifePlacedFeatures = (event) => { event.remove('tfc:in_biome/veins', 'firmalife:vein/normal_chromite') event.remove('tfc:in_biome/veins', 'firmalife:vein/deep_chromite') -} - -// event.hide('firmalife:metal/chromium') -// event.hide('firmalife:metal/stainless_steel') \ No newline at end of file +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 45c59b48f..320eaec4a 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -47,16 +47,18 @@ ServerEvents.tags('block', event => { * Событие регистрации жидкость-тэгов. */ ServerEvents.tags('fluid', event => { - registerTFCFluidTags(event) registerCreateFluidTags(event) + registerCreateAdditionsFluidTags(event) + registerFirmaLifeBlockTags(event) + registerTFCFluidTags(event) }) /** * Событие регистрации тегов структур. */ ServerEvents.tags('worldgen/placed_feature', event => { - registerTFCPlacedFeatures(event) registerFirmaLifePlacedFeatures(event) + registerTFCPlacedFeatures(event) }) /** @@ -72,11 +74,10 @@ ServerEvents.highPriorityData(event => { * Срабатывает до инициализации рецептов, но после тегов. */ TFCEvents.data(event => { - registerTFCDataForTFC(event) - registerTFCDataForWaterFlasks(event) - registerTFCDataForTreeTap(event) - registerTFCDataForGTCEU(event) + registerTFCDataForTFC(event) + registerTFCDataForTreeTap(event) + registerTFCDataForWaterFlasks(event) }) /** @@ -130,5 +131,6 @@ ServerEvents.recipes(event => { registerFTBQuestsRecipes(event) - registerChiselAndBitsRecipes(event)*/ + registerChiselAndBitsRecipes(event) + */ }) \ No newline at end of file diff --git a/kubejs/server_scripts/more_red/tags.js b/kubejs/server_scripts/more_red/tags.js index 535ea19ee..0f3842b1f 100644 --- a/kubejs/server_scripts/more_red/tags.js +++ b/kubejs/server_scripts/more_red/tags.js @@ -9,7 +9,7 @@ const registerMoreRedItemTags = (event) => { }) } -const registerMoreRedBlockags = (event) => { +const registerMoreRedBlockTags = (event) => { // Удаление тегов у отключенных предметов global.MORE_RED_DISABLED_ITEMS.forEach(item => { diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index f0dce81a2..306359ed9 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -311,6 +311,36 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_wooden_bucket', 'gtceu:creosote') event.add('tfc:usable_in_red_steel_bucket', 'gtceu:creosote') event.add('tfc:usable_in_blue_steel_bucket', 'gtceu:creosote') + + // Добавляем тег для скрытия в EMI + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth_bronze') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bronze') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/black_bronze') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/brass') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/copper') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/gold') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/nickel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/rose_gold') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/silver') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/tin') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/zinc') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/sterling_silver') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/wrought_iron') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/black_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/red_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/blue_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/cast_iron') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/pig_iron') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/high_carbon_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/high_carbon_black_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/high_carbon_red_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/high_carbon_blue_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/weak_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/weak_red_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/weak_blue_steel') + event.add('c:hidden_from_recipe_viewers', 'tfc:metal/unknown') } const registerTFCPlacedFeatures = (event) => { @@ -405,33 +435,4 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:vein/surface_sphalerite') event.add('tfc:in_biome/veins', 'tfg:vein/surface_tetrahedrite') event.add('tfc:in_biome/veins', 'tfg:geode') -} -/* -event.hide('tfc:metal/bismuth') -event.hide('tfc:metal/bismuth_bronze') -event.hide('tfc:metal/bronze') -event.hide('tfc:metal/black_bronze') -event.hide('tfc:metal/brass') -event.hide('tfc:metal/copper') -event.hide('tfc:metal/gold') -event.hide('tfc:metal/nickel') -event.hide('tfc:metal/rose_gold') -event.hide('tfc:metal/silver') -event.hide('tfc:metal/tin') -event.hide('tfc:metal/zinc') -event.hide('tfc:metal/sterling_silver') -event.hide('tfc:metal/wrought_iron') -event.hide('tfc:metal/steel') -event.hide('tfc:metal/black_steel') -event.hide('tfc:metal/red_steel') -event.hide('tfc:metal/blue_steel') -event.hide('tfc:metal/cast_iron') -event.hide('tfc:metal/pig_iron') -event.hide('tfc:metal/high_carbon_steel') -event.hide('tfc:metal/high_carbon_black_steel') -event.hide('tfc:metal/high_carbon_red_steel') -event.hide('tfc:metal/high_carbon_blue_steel') -event.hide('tfc:metal/weak_steel') -event.hide('tfc:metal/weak_red_steel') -event.hide('tfc:metal/weak_blue_steel') -event.hide('tfc:metal/unknown')*/ \ No newline at end of file +} \ No newline at end of file diff --git a/kubejs/server_scripts/treetap/recipes.js b/kubejs/server_scripts/treetap/recipes.js index 5b41235d7..f86216a63 100644 --- a/kubejs/server_scripts/treetap/recipes.js +++ b/kubejs/server_scripts/treetap/recipes.js @@ -14,7 +14,7 @@ const registerTreeTapRecipes = (event) => { .resultFluid(Fluid.of('gtceu:copper', 144)) .id('tfg:heating/treetap') - // Latex + // Latex From Kapok event.custom({ type: "treetap:tap_extract", log: {