From a07c9acd7534b81ae1b6771a8750b0159fdcf009 Mon Sep 17 00:00:00 2001 From: Xtrial-01 Date: Tue, 28 Oct 2025 18:02:22 +0100 Subject: [PATCH] Few quick bug fixes (#1999, #2111 and #2112) (#2119) * T2 Rocket Alloy ABS recipes Adds Alloy Blast Smelter recipe for t2 rocket alloy and Vacuum Freezer recipe for cooling molten t2 rocket alloy. * #2111 Fix Changes salves recipes from Aminophenol to Phenol * #2112 Fix Adds cobalt brass wrench to "Tools of the Trade" quest smart filter * #1999 Fix Adds assembler recipes for converting item busses to railgun item busses * recipes.space.js optimization --------- Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Co-authored-by: Pyritie --- .../quests/chapters/questssteam_age.snbt | 2 +- kubejs/server_scripts/tfg/recipes.medicine.js | 10 +++++----- kubejs/server_scripts/tfg/recipes.space.js | 20 +++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 4f068a59b..b205356d3 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -1140,7 +1140,7 @@ Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:copper_wrench)item(gtceu:bronze_wrench)item(gtceu:black_bronze_wrench)item(gtceu:bismuth_bronze_wrench)item(gtceu:wrought_iron_wrench)item(gtceu:steel_wrench))" + "ftbfiltersystem:filter": "or(item(gtceu:copper_wrench)item(gtceu:bronze_wrench)item(gtceu:black_bronze_wrench)item(gtceu:bismuth_bronze_wrench)item(gtceu:wrought_iron_wrench)item(gtceu:steel_wrench)item(gtceu:cobalt_brass_wrench))" } } type: "item" diff --git a/kubejs/server_scripts/tfg/recipes.medicine.js b/kubejs/server_scripts/tfg/recipes.medicine.js index ca7fa3492..306daecd4 100644 --- a/kubejs/server_scripts/tfg/recipes.medicine.js +++ b/kubejs/server_scripts/tfg/recipes.medicine.js @@ -503,7 +503,7 @@ function registerTFGMedicineRecipes(event) { event.recipes.gtceu.mixer(`tfg:gtceu/mixer/salvo_invisibility`) .circuit(4) - .inputFluids(Fluid.of('gtceu:aminophenol', 250)) + .inputFluids(Fluid.of('gtceu:phenol', 250)) .itemOutputs('1x tfg:invisibility_salvo') .itemInputs('gtceu:sticky_resin', '#tfg:invisibility_ingredients', ChemicalHelper.get(TagPrefix.dust, GTMaterials.TricalciumPhosphate, 1)) .duration(200) @@ -515,7 +515,7 @@ function registerTFGMedicineRecipes(event) { event.recipes.gtceu.mixer(`tfg:gtceu/mixer/salvo_fire_resistance`) .circuit(4) - .inputFluids(Fluid.of('gtceu:aminophenol', 250)) + .inputFluids(Fluid.of('gtceu:phenol', 250)) .itemOutputs('1x tfg:fire_resistance_salvo') .itemInputs('gtceu:sticky_resin', '#tfg:fire_resistance_ingredients', ChemicalHelper.get(TagPrefix.dust, GTMaterials.TricalciumPhosphate, 1)) .duration(200) @@ -527,7 +527,7 @@ function registerTFGMedicineRecipes(event) { event.recipes.gtceu.mixer(`tfg:gtceu/mixer/salvo_resistance`) .circuit(4) - .inputFluids(Fluid.of('gtceu:aminophenol', 250)) + .inputFluids(Fluid.of('gtceu:phenol', 250)) .itemOutputs('1x tfg:resistance_salvo') .itemInputs('gtceu:sticky_resin', '#tfg:resistance_ingredients', ChemicalHelper.get(TagPrefix.dust, GTMaterials.TricalciumPhosphate, 1)) .duration(200) @@ -539,7 +539,7 @@ function registerTFGMedicineRecipes(event) { event.recipes.gtceu.mixer(`tfg:gtceu/mixer/salvo_instant_health`) .circuit(4) - .inputFluids(Fluid.of('gtceu:aminophenol', 250)) + .inputFluids(Fluid.of('gtceu:phenol', 250)) .itemOutputs('1x tfg:instant_health_salvo') .itemInputs('gtceu:sticky_resin', '#tfg:instant_health_ingredients', ChemicalHelper.get(TagPrefix.dust, GTMaterials.TricalciumPhosphate, 1)) .duration(200) @@ -551,7 +551,7 @@ function registerTFGMedicineRecipes(event) { event.recipes.gtceu.mixer(`tfg:gtceu/mixer/salvo_absorption`) .circuit(4) - .inputFluids(Fluid.of('gtceu:aminophenol', 250)) + .inputFluids(Fluid.of('gtceu:phenol', 250)) .itemOutputs('1x tfg:absorption_salvo') .itemInputs('gtceu:sticky_resin', '#tfg:absorption_ingredients', ChemicalHelper.get(TagPrefix.dust, GTMaterials.TricalciumPhosphate, 1)) .duration(200) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index bedeb1b6a..116faaea0 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -281,6 +281,26 @@ function registerTFGSpaceRecipes(event) { // Railgun stuff // (the railgun inputs and outputs are in tfg-core) + + //item bus to railgun item bus conversion recipes + const GTTiers = ['ulv', 'lv', 'mv', 'hv', 'ev', 'iv', 'luv', 'zpm', 'uv', 'uhv'] + GTTiers.forEach(x => { + event.recipes.gtceu.assembler(`tfg:${x}_input_to_${x}_railgun_input_assembler`) + .itemInputs(`gtceu:${x}_input_bus`) + .circuit(4) + .itemOutputs(`tfg:${x}_railgun_item_loader_in`) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.assembler(`tfg:${x}_output_to_${x}_railgun_output_assembler`) + .itemInputs(`gtceu:${x}_output_bus`) + .circuit(4) + .itemOutputs(`tfg:${x}_railgun_item_loader_out`) + .duration(20 * 5) + .EUt(GTValues.VA[GTValues.LV]) + }) + + //Railgun ammo event.recipes.gtceu.assembler('tfg:railgun_ammo_basic') .itemInputs('#forge:double_plates/steel', '2x #forge:rods/magnetic_iron', '2x #forge:fine_wires/annealed_copper') .inputFluids('gtceu:rocket_fuel 250')