From c855a7cac9d06f116efd176eb317f679fd07f890 Mon Sep 17 00:00:00 2001 From: Jeuv <73312791+Jeuvke@users.noreply.github.com> Date: Sat, 6 Dec 2025 02:57:48 +0100 Subject: [PATCH 1/2] Replace bronze drums & crates in recipes with new tags containing all 3 bronze drums & crates (#2328) * Add crates and drums to bronze tag Add bronze, bismuth bronze, and black bronze crates & drums to their own tag * Replace bronze crates & drums with the new tag Replaces all the bronze crates and drum with a tag containing the other 2 bronzes as well. * Add recipe filtering to replaceInput Add input-based recipe filtering for the replaceInput for bronze drums & crates. Also add recipe filtering for the recipes that use the moss tag. Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com> --------- Signed-off-by: Jeuv <73312791+Jeuvke@users.noreply.github.com> Co-authored-by: Redeix --- kubejs/server_scripts/tfg/recipes.miscellaneous.js | 9 +++++++-- kubejs/server_scripts/tfg/tags.js | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index bfa6163b8..b6031ab30 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -8,7 +8,7 @@ function registerTFGMiscellaneousRecipes(event) { //Moss - event.replaceInput({}, 'minecraft:vine', '#tfc:moss') + event.replaceInput({input: 'minecraft:vine'}, 'minecraft:vine', '#tfc:moss') event.shapeless('1x minecraft:moss_block', [ '#tfc:dirt', @@ -95,7 +95,12 @@ function registerTFGMiscellaneousRecipes(event) { .itemOutputs('tfg:wireless_card') .duration(300) .EUt(GTValues.VA[GTValues.EV]) - + + // Replace bronze drums & crates with a tag containing the 3 different bronzes + // NOTE: A better way to do this would be to overwrite GTCraftingComponents.CRATE and GTCraftingComponents.DRUM in crafting_components.js, but tags seem to get populated after the recipes get registed, so... + event.replaceInput({input: 'gtceu:bronze_crate'}, 'gtceu:bronze_crate', '#tfg:any_bronze_crate') + event.replaceInput({input: 'gtceu:bronze_drum'}, 'gtceu:bronze_drum', '#tfg:any_bronze_drum') + //#region RNR Paving Cart const rubber_types = [ {fluid:'styrene_butadiene_rubber', quantity: 144}, diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 8735c6b48..0362ce7d9 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -30,6 +30,14 @@ const registerTFGItemTags = (event) => { event.add('tfg:platinum_ore_group', 'gtceu:purified_cooperite_ore') event.add('tfg:platinum_ore_group', 'gtceu:purified_chalcocite_ore') + //Bronze Crates & Drums + event.add('tfg:any_bronze_crate', 'gtceu:bronze_crate') + event.add('tfg:any_bronze_crate', 'gtceu:black_bronze_crate') + event.add('tfg:any_bronze_crate', 'gtceu:bismuth_bronze_crate') + event.add('tfg:any_bronze_drum', 'gtceu:bronze_drum') + event.add('tfg:any_bronze_drum', 'gtceu:black_bronze_drum') + event.add('tfg:any_bronze_drum', 'gtceu:bismuth_bronze_drum') + //#region Tools event.add('tfg:empty_dna_syringes', 'tfg:empty_dna_syringe') event.add('tfg:empty_dna_syringes', 'tfg:clean_dna_syringe') From 8597092ead496081136514f0c625b7c7b6df3006 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 6 Dec 2025 09:29:14 +0000 Subject: [PATCH 2/2] Update README.md (#2332) Signed-off-by: Pyritie --- .github/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/README.md b/.github/README.md index ec88c111d..299a0a111 100644 --- a/.github/README.md +++ b/.github/README.md @@ -68,6 +68,7 @@ Want to help translate? Please read [this](../kubejs/README_IF_TRANSLATING.md) i - [GregTech Community Pack Modern](https://www.curseforge.com/minecraft/modpacks/gregtech-community-pack-modern) for most of their quest text. - [Better End](https://www.curseforge.com/minecraft/mc-mods/betterend) for some assets. - Uni for Mars' dunes terrain generation. +- Flare from the [Cosmic Frontiers](https://www.curseforge.com/minecraft/modpacks/cosmic-frontiers) team for some icon set textures. [TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft