From dfd673c36950593313d54dfc384238d9ff163f91 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 10 Feb 2026 14:07:06 +0000 Subject: [PATCH] cleaned up a bunch of regexes --- kubejs/server_scripts/firmalife/recipes.js | 4 +- kubejs/server_scripts/greate/recipes.js | 47 -------- .../server_scripts/greate/recipes.removes.js | 16 +-- kubejs/server_scripts/tfc/recipes.removes.js | 14 ++- .../tfg/powergen/recipes.boiler.js | 103 +++++++++++------- kubejs/startup_scripts/tfc/constants.js | 32 ++++++ 6 files changed, 111 insertions(+), 105 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index e1e4ba600..bd07ce3db 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -44,7 +44,9 @@ const registerFirmaLifeRecipes = (event) => { event.remove({ id: 'firmalife:heating/metal/stainless_steel_block_slab' }) event.remove({ id: 'firmalife:heating/metal/stainless_steel_block_stairs' }) - event.remove({ id: /^firmalife:crafting\/.*_dough/ }) + global.TFC_DOUGHS.forEach(dough => { + event.remove({ id: `firmalife:crafting/${dough}_dough` }) + }) event.remove({ id: 'firmalife:pot/chocolate' }) diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index cdce0215e..4d4aa5fcf 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -88,29 +88,7 @@ function registerGreateRecipes(event) { // #region Gearboxes global.AVAILABLE_GREATE_MATERIAL_TIERS.forEach(tier => { - - event.shaped(`greate:${tier}_gearbox`, [ - ' A ', - 'ABA', - 'CA ' - ], { - A: `greate:${tier}_shaft`, - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id(`tfg:shaped/${tier}_gearbox`) - - event.shaped(`greate:${tier}_vertical_gearbox`, [ - 'A A', - ' B ', - 'ACA' - ], { - A: `greate:${tier}_shaft`, - B: 'create:andesite_casing', - C: '#forge:tools/wrenches' - }).id(`tfg:shaped/${tier}_vertical_gearbox`) - event.shapeless(`greate:${tier}_gearbox`, [`greate:${tier}_vertical_gearbox`]) - event.shapeless(`greate:${tier}_vertical_gearbox`, [`greate:${tier}_gearbox`]) event.recipes.gtceu.assembler(`greate:${tier}_gearbox`) .itemInputs('create:andesite_casing', `4x greate:${tier}_shaft`) @@ -1122,31 +1100,6 @@ function registerGreateRecipes(event) { // #endregion - event.recipes.gtceu.shaped('greate:wire_coating_factory', [ - 'ABA', - 'CDC', - 'ABA' - ], { - A: 'gtceu:watertight_casing', - B: '#gtceu:circuits/iv', - C: 'gtceu:iv_electric_pump', - D: 'create:spout' - }).addMaterialInfo().id('tfg:shaped/toms_favourite_block') - - event.shaped(`2x greate:treated_wood_window`, [ - 'BAB', - ' B ' - ], { - A: '#forge:glass', - B: 'gtceu:treated_wood_planks' - }).id(`tfg:greate/shaped/treated_wood_window`) - - event.shapeless(`2x greate:treated_wood_window_pane`, - [ - `greate:treated_wood_window`, - '#forge:tools/saws' - ]).id('tfg:greate/shapeless/treated_wood_window_pane') - event.recipes.gtceu.cutter(`tfg:greate/greate:treated_wood_window_pane`) .itemInputs(`3x greate:treated_wood_window`) .itemOutputs(`8x greate:treated_wood_window_pane`) diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index fbac8a351..a55dbed2e 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -55,17 +55,11 @@ function removeGreateRecipes(event) { event.remove({ id: 'gtceu:shaped/andesite_alloy_shaft' }) event.remove({ id: 'gtceu:extractor/extract_andesite_alloy' }) - - event.remove({ id: /^greate:mixing\/integration\/create\/.*/ }) - event.remove({ id: /^greate:sawing\/integration\/create\/.*/ }) - event.remove({ id: /^greate:splashing\/integration\/create\/.*/ }) - event.remove({ id: /^greate:crushing\/integration\/create\/.*/ }) - event.remove({ id: /^greate:milling\/integration\/create\/.*/ }) - event.remove({ id: /^greate:compacting\/integration\/.*/ }) - event.remove({ id: /^greate:pressing\/integration\/.*/ }) - event.remove({ id: /^greate:shaped\/.*/ }) - event.remove({ id: /^greate:shapeless\/.*/ }) + event.remove({ id: /^greate:(mixing|sawing|splashing|crushing|milling)\/integration\/(create|createaddition|vintageimprovements)\/.*/ }) + event.remove({ id: /^greate:(compacting|pressing)\/integration\/.*/ }) + + event.remove({ mod: 'greate', type: 'minecraft:crafting_shapeless' }) event.remove({ mod: 'greate', type: 'create:deploying' }); event.remove({ mod: 'greate', type: 'create:sequenced_assembly' }); event.remove({ mod: 'greate', type: 'gtceu:assembler' }); @@ -85,8 +79,6 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:milling/integration/gtceu/macerator/quartz_sand_from_sand' }) event.remove({ id: 'greate:mixing/brass_ingot' }) - event.remove({ id: /^greate:.*\/integration\/createaddition/ }) - event.remove({ id: /^greate:.*\/integration\/vintageimprovements/ }) event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule' }) event.remove({ id: 'greate:cutting/integration/gtceu/cutter/cut_phosphorus_boule_water' }) diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 90f5266bc..985346d0a 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -11,9 +11,11 @@ function removeTFCRecipes(event) { event.remove({ id: /tfc:heating\/metal\/*/ }) event.remove({ id: /tfc:heating\/ore\/*/ }) - event.remove({ id: /tfc:crafting\/metal\/block\/*/ }) - event.remove({ id: /tfc:crafting\/metal\/block\/*_stairs/ }) - event.remove({ id: /tfc:crafting\/metal\/block\/*_slab/ }) + global.TFC_METALS.forEach(metal => { + event.remove({ id: `tfc:crafting/metal/block/${metal}` }) + event.remove({ id: `tfc:crafting/metal/block/${metal}_stairs` }) + event.remove({ id: `tfc:crafting/metal/block/${metal}_slab` }) + }) // #region Удаление рецептов event.remove({ id: 'tfc:quern/amethyst' }) @@ -121,7 +123,11 @@ function removeTFCRecipes(event) { event.remove({ id: 'tfc:crafting/pumpkin_chunks' }) event.remove({ id: 'tfc:crafting/alabaster_brick' }) - event.remove({ id: /^tfc:crafting\/dough\/.*/ }) + global.TFC_DOUGHS.forEach(dough => { + for (let i = 1; i <= 8; i++) { + event.remove({ id: `tfc:crafting/dough/${dough}_dough_${i}` }) + } + }) event.remove({ id: 'tfc:heating/destroy_bread' }) event.remove({ id: 'tfc:crafting/gunpowder_graphite' }) diff --git a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js index 0ca747411..81eaaf6a0 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.boiler.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.boiler.js @@ -2,47 +2,68 @@ function registerTFGBoilerRecipes(event) { - //Remove boiler recipes that are unlikely to be used and pollute the recipe tab (most everything excluding coke/charcoal) - event.remove({ id: /gtceu:....._boiler\/mcw.+/ }) - event.remove({ id: /gtceu:....._boiler\/.*button.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*trapdoor.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*banner.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*wool.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*fence.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*treated.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*cardboard.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*pressure_plate.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*carpet.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*stairs.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*sign.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*door.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*planks.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*slab.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*biomass.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*bio_chaff.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*chest.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*bundle.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*lectern.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*cartography.*/}) - event.remove({ id: /gtceu:....._boiler\/.*ladder.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*crossbow.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*jukebox.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*resin.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*daylight_detector.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*bow.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*scaffolding.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*loom.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*bowl.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*sticky_resin.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*plant_ball.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*note_block.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*smithing_table.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*fiberboard.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*wood.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*sapling.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*log.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*stem.*/ }) - event.remove({ id: /gtceu:....._boiler\/.*mosaic.*/ }) + function removeBoilerRecipe(id) { + event.remove({ id: `gtceu:steam_boiler/${id}` }) + event.remove({ id: `gtceu:large_boiler/${id}` }) + } + + removeBoilerRecipe('minecraft_chest') + removeBoilerRecipe('minecraft_cartography_table') + removeBoilerRecipe('minecraft_smithing_table') + removeBoilerRecipe('minecraft_note_block') + removeBoilerRecipe('minecraft_crossbow') + removeBoilerRecipe('minecraft_lectern') + removeBoilerRecipe('minecraft_daylight_detector') + removeBoilerRecipe('minecraft_ladder') + removeBoilerRecipe('minecraft_bamboo_mosaic') + removeBoilerRecipe('minecraft_bamboo_mosaic_slab') + removeBoilerRecipe('minecraft_bamboo_mosaic_stairs') + removeBoilerRecipe('minecraft_bow') + removeBoilerRecipe('minecraft_bowl') + removeBoilerRecipe('minecraft_scaffolding') + removeBoilerRecipe('minecraft_cartography_table') + removeBoilerRecipe('minecraft_jukebox') + removeBoilerRecipe('minecraft_loom') + removeBoilerRecipe('minecraft_bamboo') + removeBoilerRecipe('minecraft_stick') + removeBoilerRecipe('create_cardboard') + removeBoilerRecipe('create_cardboard_block') + removeBoilerRecipe('create_bound_cardboard_block') + removeBoilerRecipe('create_cardboard_sword') + removeBoilerRecipe('create_cardboard_helmet') + removeBoilerRecipe('create_cardboard_chestplate') + removeBoilerRecipe('create_cardboard_leggings') + removeBoilerRecipe('create_cardboard_boots') + removeBoilerRecipe('gtceu_bio_chaff') + removeBoilerRecipe('gtceu_plant_ball') + removeBoilerRecipe('gtceu_wood_plate') + removeBoilerRecipe('gtceu_treated_wood_plate') + removeBoilerRecipe('gtceu_sticky_resin') + removeBoilerRecipe('gtceu_small_wood_dust') + removeBoilerRecipe('gtceu_small_treated_wood_dust') + removeBoilerRecipe('gtceu_tiny_wood_dust') + removeBoilerRecipe('gtceu_tiny_treated_wood_dust') + removeBoilerRecipe('gtceu_wood_bolt') + removeBoilerRecipe('gtceu_wood_frame') + removeBoilerRecipe('gtceu_wood_screw') + removeBoilerRecipe('gtceu_treated_wood_rod') + removeBoilerRecipe('gtceu_treated_wood_frame') + removeBoilerRecipe('gtceu_long_wood_rod') + removeBoilerRecipe('gtceu_long_treated_wood_rod') + removeBoilerRecipe('gtceu_small_wood_gear') + removeBoilerRecipe('gtceu_wood_gear') + removeBoilerRecipe('gtceu_wood_dust') + removeBoilerRecipe('gtceu_treated_wood_dust') + removeBoilerRecipe('gtceu_small_coke_dust') + removeBoilerRecipe('gtceu_small_charcoal_dust') + removeBoilerRecipe('gtceu_small_coal_dust') + removeBoilerRecipe('gtceu_tiny_coke_dust') + removeBoilerRecipe('gtceu_tiny_coal_dust') + removeBoilerRecipe('gtceu_tiny_charcoal_dust') + removeBoilerRecipe('gtceu_pure_coal_dust') + removeBoilerRecipe('gtceu_impure_coal_dust') + removeBoilerRecipe('createaddition_biomass_pellet') + removeBoilerRecipe('createaddition_biomass_pellet_block') //Re-add some recipes to the boiler under tags event.recipes.gtceu.steam_boiler('tfg:logs') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 19a876b1c..40db9006e 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -954,6 +954,38 @@ global.TFC_EQUIPMENT_METALS = /** @type {const} */ ([ "blue_steel" ]); +global.TFC_METALS = /** @type {const} */ ([ + "copper", + "bismuth_bronze", + "bronze", + "black_bronze", + "wrought_iron", + "steel", + "black_steel", + "red_steel", + "blue_steel", + + "bismuth", + "brass", + "gold", + "rose_gold", + "silver", + "sterling_silver", + "nickel", + "zinc", + "tin", + "cast_iron" +]); + +global.TFC_DOUGHS = /** @type {const} */ ([ + "barley", + "maize", + "oat", + "rye", + "rice", + "wheat" +]); + global.TFC_BIOMES = /** @type {const} */ ([ 'tfc:badlands', 'tfc:canyons',