From 29f4d54af3d8dbc87951fea8233f9a5601fbecda Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 11 Dec 2025 17:37:22 -0600 Subject: [PATCH 1/4] Tags (#2385) Signed-off-by: Redeix --- kubejs/startup_scripts/tfg/items.food.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index e07c5fdfc..3c9cdbe03 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -444,7 +444,8 @@ function registerTFGFoodItems(event) { event.create('tfg:food/oatmeal') .translationKey('item.tfg.food.oatmeal') .texture('tfg:item/food/oatmeal') - .food(food => food.hunger(8).saturation(8)); + .food(food => food.hunger(8).saturation(8)) + .tag('tfc:foods'); // Instant Mac event.create('tfg:food/raw_instant_mac') @@ -453,7 +454,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(2).saturation(2) .eaten(ctx => { ctx.player.give('create:cardboard') - })); + })) + .tag('tfc:foods'); event.create('tfg:food/cooked_instant_mac') .translationKey('item.tfg.food.cooked_instant_mac') @@ -461,7 +463,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(4) .eaten(ctx => { ctx.player.give('create:cardboard') - })); + })) + .tag('tfc:foods'); //#region Spices From a90bc5ceab834d7ce5a79570b8d57fc516ad5d8f Mon Sep 17 00:00:00 2001 From: Mqrius Date: Fri, 12 Dec 2025 01:02:30 +0100 Subject: [PATCH 2/4] Fix quest MV quad pipe accepted items (#2384) Accept any quadruple or nonuple pipe based on item tags, instead of one of three specific items. Signed-off-by: Mqrius --- config/ftbquests/quests/chapters/mv__medium_voltage.snbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index 43acaadc6..bc13fe450 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1221,7 +1221,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:aluminium_quadruple_fluid_pipe)item(gtceu:blue_steel_quadruple_fluid_pipe)item(gtceu:steel_quadruple_fluid_pipe))" + "ftbfiltersystem:filter": "or(item_tag(forge:quadruple_fluid_pipes)item_tag(forge:nonuple_fluid_pipes))" } } title: "Multiple Channel Potin Pipes, please" From 90c133aa45e71835fe4578ca877d20d6f2fad65d Mon Sep 17 00:00:00 2001 From: Mqrius Date: Fri, 12 Dec 2025 01:37:54 +0100 Subject: [PATCH 3/4] Various optional tags for quest items (#2386) * Make Greate shaft & small cogwheel optional Signed-off-by: Mqrius * LV: Make greate shaft and small cogwheel optional Signed-off-by: Mqrius * LV: make light fuel bucket optional Signed-off-by: Mqrius * MV: Make greate shaft and small cogwheel optional Signed-off-by: Mqrius * HV: Make greate shaft and small cogwheel optional Signed-off-by: Mqrius --------- Signed-off-by: Mqrius Co-authored-by: Redeix --- config/ftbquests/quests/chapters/hv__high_voltage.snbt | 2 ++ config/ftbquests/quests/chapters/lv__low_voltage.snbt | 3 +++ config/ftbquests/quests/chapters/mv__medium_voltage.snbt | 2 ++ config/ftbquests/quests/chapters/questssteam_age.snbt | 2 ++ 4 files changed, 9 insertions(+) diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index f5cb60ee7..1a800c913 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -1619,6 +1619,7 @@ { id: "5B94BB35A8480214" item: "greate:titanium_cogwheel" + optional_task: true type: "item" } { @@ -1629,6 +1630,7 @@ { id: "2E602B31550041B9" item: "greate:titanium_shaft" + optional_task: true type: "item" } ] diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index 9097d9d30..145d185b8 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -1623,6 +1623,7 @@ { id: "1483488F0E301BCC" item: "greate:aluminium_cogwheel" + optional_task: true type: "item" } { @@ -1633,6 +1634,7 @@ { id: "32C96E141753187B" item: "greate:aluminium_shaft" + optional_task: true type: "item" } ] @@ -1700,6 +1702,7 @@ { id: "34153032225B76BB" item: "gtceu:light_fuel_bucket" + optional_task: true type: "item" } { diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index bc13fe450..ee5222806 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -1636,6 +1636,7 @@ { id: "53919EE5BCCA618A" item: "greate:stainless_steel_cogwheel" + optional_task: true type: "item" } { @@ -1646,6 +1647,7 @@ { id: "6DF7F28AABF6785F" item: "greate:stainless_steel_shaft" + optional_task: true type: "item" } ] diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 4841ea4b5..e57698968 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -378,11 +378,13 @@ { id: "23DE370285589CB4" item: "greate:steel_shaft" + optional_task: true type: "item" } { id: "4FDD99090C920E21" item: "greate:steel_cogwheel" + optional_task: true type: "item" } { From 2a9f70e35e59142229afafdf51308d417e2ecddf Mon Sep 17 00:00:00 2001 From: Epicificator <143143550+Epicificator@users.noreply.github.com> Date: Fri, 12 Dec 2025 16:35:44 -0500 Subject: [PATCH 4/4] add acetic acid and vinegar conversion (#2390) * add acetic acid and vinegar conversion Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com> * add circuit condition to prevent conflicting with dye recipes Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com> * changed machine to mixer, and voltage tier to mv Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com> --------- Signed-off-by: Epicificator <143143550+Epicificator@users.noreply.github.com> --- kubejs/server_scripts/tfc/recipes.js | 48 ++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index a6da50e30..c67e8352b 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -241,4 +241,52 @@ const registerTFCRecipes = (event) => { .itemOutputs('tfc:wrought_iron_grill') .duration(60) .EUt(8) + + //Jigabit's stupid acetic acid to vinegar conversion + + event.recipes.gtceu.mixer('vinegar_from_acetic_acid') + .inputFluids( + Fluid.of('minecraft:water', 950), + Fluid.of('gtceu:acetic_acid', 50) + ) + .outputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .circuit(1) + .duration(30) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillery('acetic_acid_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50) + ) + .circuit(1) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillery('water_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('minecraft:water', 950) + ) + .circuit(2) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillation_tower('vinegar_distillation') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50), + Fluid.of('minecraft:water', 950) + ) + .duration(80) + .EUt(GTValues.VA[GTValues.MV]) + }