Merge branch 'dev' into feature/wab-1.4

This commit is contained in:
Pyritie 2026-02-01 17:37:25 +00:00
commit 849f6409d5
165 changed files with 5992 additions and 817 deletions

View file

@ -131,7 +131,7 @@ function registerTFGCasingRecipes(event) {
// Ostrum Linear Acclerator
event.recipes.gtceu.assembler('tfg:casings/machine_casing_mars')
.itemInputs('gtceu:clean_machine_casing', '4x #forge:double_wires/kanthal')
.inputFluids(Fluid.of('gtceu:polybenzimidazole', 288))
.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288))
.itemOutputs('tfg:casings/machine_casing_mars')
.circuit(6)
.duration(2.5 * 20)
@ -145,6 +145,34 @@ function registerTFGCasingRecipes(event) {
.duration(2.5 * 20)
.EUt(GTValues.VA[GTValues.HV])
// Heat Battery deafission:battery_heat_port_ev
event.recipes.gtceu.assembler('tfg:battery_heat_port_ev')
.itemInputs(Item.of('gtceu:iv_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:silicon_plate', 6))
.inputFluids(Fluid.of('gtceu:mercury', 4000))
.itemOutputs('deafission:battery_heat_port_ev')
//.circuit(6)
.duration(2.5 * 20)
.EUt(GTValues.VA[GTValues.EV])
// Small Modular Turbine
event.recipes.gtceu.assembler('tfg:machine_casing_desh_ptfe')
.itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:hsla_steel_frame'))
.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288))
.itemOutputs('tfg:casings/machine_casing_desh_ptfe')
.circuit(6)
.duration(2.5 * 20)
.EUt(GTValues.VA[GTValues.HV])
event.recipes.gtceu.assembler('tfg:uv_smr_fluid_import_hatch')
.itemInputs('4x #forge:dense_plates/desh', '2x #forge:dense_plates/lead', Item.of('gtceu:iv_input_hatch', 1))
.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288))
.itemOutputs('tfg:uv_smr_fluid_import_hatch')
//.circuit(6)
.duration(2.5 * 20)
.EUt(GTValues.VA[GTValues.EV])
// Vacuum Intake
event.shaped('tfg:casings/machine_casing_vacuum_engine_intake', [
'USU',

View file

@ -74,4 +74,21 @@ function registerTFGCoilRecipes(event) {
.addMaterialInfo(true, true)
// #endregion
// #region RTM Coil
event.remove({ id : 'gtceu:assembler/coil_rtm_alloy' })
event.recipes.gtceu.assembler('tfg:coil_rtm_alloy')
.itemInputs('8x #forge:double_wires/rtm_alloy', '8x #forge:foils/vanadium_steel', '#forge:insulation_t2/sheet')
.inputFluids('tfg:nichromium_iodomethylate 244')
.itemOutputs('gtceu:rtm_alloy_coil_block')
.duration(20 * 25)
.EUt(GTValues.VA[GTValues.EV])
.addMaterialInfo(true, true)
event.recipes.gtceu.mixer('tfg:nichromium_iodomethylate')
.inputFluids(Fluid.of('gtceu:nichrome', 144), Fluid.of('tfg:iodomethane', 100))
.outputFluids('tfg:nichromium_iodomethylate 244')
.duration(20 * 8)
.EUt(GTValues.VA[GTValues.HV])
}

View file

@ -120,13 +120,26 @@ function registerTFGMultiblockRecipes(event) {
'PTP'
], {
S: 'tfg:casings/machine_casing_vacuum_engine_intake',
Z: 'gtceu:iv_machine_hull',
W: '#gtceu:circuits/iv',
Z: 'gtceu:ev_machine_hull',
W: '#gtceu:circuits/ev',
U: '#forge:double_plates/stellite_100',
T: '#forge:single_cables/platinum',
P: 'gtceu:iv_electric_pump'
T: '#forge:single_cables/aluminium',
P: 'gtceu:ev_electric_pump'
}).addMaterialInfo().id('tfg:shaped/ostrum_linear_accelerator')
event.recipes.gtceu.shaped('tfg:heat_battery_mk1', [
'USU',
'WZW',
'PTP'
], {
S: 'tfg:casings/heat_pipe_casing',
Z: 'gtceu:ev_machine_hull',
W: '#gtceu:circuits/ev',
U: '#forge:dense_plates/silicon',
T: '#forge:single_cables/aluminium',
P: 'gtceu:hv_field_generator'
}).addMaterialInfo().id('tfg:shaped/heat_battery_mk1')
event.recipes.gtceu.assembler('tfg:ostrum_harvester')
.itemInputs(
'1x gtceu:ev_machine_hull',
@ -175,6 +188,28 @@ function registerTFGMultiblockRecipes(event) {
Z: 'gtceu:ev_machine_hull'
}).addMaterialInfo().id('tfg:shaped/fission_reactor_mk1')
event.recipes.gtceu.shaped('deafission:fission_reactor_smr1', [
'TUT',
'WZW',
'TUT'
], {
T: 'gtceu:atomic_casing',
W: '#gtceu:circuits/iv',
U: 'gtceu:ev_field_generator',
Z: 'gtceu:iv_machine_hull'
}).addMaterialInfo().id('tfg:shaped/fission_reactor_smr1')
event.recipes.gtceu.shaped('tfg:smr_generator', [
'TUT',
'WZW',
'TUT'
], {
T: 'tfg:casings/machine_casing_desh_ptfe',
W: '#gtceu:circuits/iv',
U: 'gtceu:ev_field_generator',
Z: 'gtceu:iv_machine_hull'
}).addMaterialInfo().id('tfg:shaped/smr_generator')
event.recipes.gtceu.shaped('gtceu:nuclear_fuel_factory', [
'TUT',
'WZW',
@ -227,8 +262,8 @@ function registerTFGMultiblockRecipes(event) {
event.remove({output: 'gtceu:active_transformer'})
event.recipes.gtceu.assembler('tfg:active_power_transformer')
.itemInputs('1x gtceu:iv_transformer_1a', '1x #gtceu:circuits/iv', '8x gtceu:uranium_triplatinum_single_wire',
'2x gtceu:hpic_chip')
.itemInputs('1x gtceu:ev_transformer_1a', '1x #gtceu:circuits/ev', '8x gtceu:uranium_triplatinum_single_wire',
'2x gtceu:mpic_chip')
.inputFluids(Fluid.of('gtceu:ostrum_iodide', 288))
.itemOutputs('tfg:active_power_transformer')
.duration(300)

View file

@ -2,8 +2,8 @@
function registerTFGMarsOstrumRecipes(event) {
var $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability");
var $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient");
const $HeatRecipeCapability = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatRecipeCapability");
const $HeatIngredient = Java.loadClass("fi.dea.mc.deafission.common.data.recipe.HeatIngredient");
const $ChanceLogic = Java.loadClass('com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic')
// Ostrum Harvester
@ -18,7 +18,7 @@ function registerTFGMarsOstrumRecipes(event) {
.EUt(GTValues.VA[GTValues.LV]);
// Ostrum Linear Accelerator Recipes
/*
event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation')
.inputFluids('gtceu:residual_radioactive_concoction 100')
.itemInputs('32x #forge:dusts/ostrum')
@ -62,13 +62,13 @@ function registerTFGMarsOstrumRecipes(event) {
.dimension('ad_astra:mars')
.duration(20 * 5)
.EUt(GTValues.VA[GTValues.IV]);
*/
// Ostrum Linear Accelerator Recipes
// .input($HeatRecipeCapability.CAP, new $HeatIngredient(X, Y)) where X is Minimal Temperature to run and where Y is HU consummed per craft
/*
event.recipes.gtceu.ostrum_linear_accelerator('tfg:ostrum_transformation')
.inputFluids('gtceu:residual_radioactive_concoction 100')
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1000))
.itemInputs('32x #forge:dusts/ostrum')
.chancedFluidOutputLogic($ChanceLogic.XOR)
.chancedFluidOutput('gtceu:lightweight_ostrum_vapor', 6000, 0)
@ -77,46 +77,49 @@ function registerTFGMarsOstrumRecipes(event) {
.dimension('ad_astra:mars')
.duration(20 * 5)
.EUt(GTValues.VA[GTValues.EV]);
//#region Light Ostrum Vapor
event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t1')
.perTick(true)
.inputFluids('gtceu:residual_radioactive_concoction 1')
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000))
.inputFluids(Fluid.of('gtceu:radon', 10))
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10)
//.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500))
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 5)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 2)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 2)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 2)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5)
.input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100))
.dimension('ad_astra:mars')
.duration(20 * 20)
.duration(20 * 120)
.EUt(GTValues.VA[GTValues.EV])
.circuit(1);
event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t2')
.perTick(true)
.inputFluids('gtceu:residual_radioactive_concoction 1')
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.inputFluids(Fluid.of('tfg:semiheavy_water', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000))
.inputFluids(Fluid.of('gtceu:radon', 10))
.inputFluids(Fluid.of('gtceu:krypton', 10))
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 3)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 3)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 3)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 3)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 1, 10)
//.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100))
.dimension('ad_astra:mars')
.duration(20 * 20)
.EUt(GTValues.VA[GTValues.IV])
.duration(20 * 120)
.EUt(GTValues.VA[GTValues.EV])
.circuit(2);
event.recipes.gtceu.ostrum_linear_accelerator('tfg:lightweight_ostrum_vapor_t3')
.perTick(true)
.inputFluids('gtceu:residual_radioactive_concoction 1')
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.inputFluids(Fluid.of('tfg:semiheavy_water', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor',1000))
@ -124,17 +127,108 @@ function registerTFGMarsOstrumRecipes(event) {
.inputFluids(Fluid.of('gtceu:krypton', 10))
.inputFluids(Fluid.of('gtceu:tritiated_water', 10))
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/thorium'), 10, 20)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 10)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 10, 10)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/silver'), 1, 5)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_tricalcium_phosphate'), 1, 5)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/bauxite'), 1, 5)
.itemOutputsRanged(Item.of('#forge:dusty_raw_materials/lead'), 1, 5)
.itemOutputsRanged(Item.of('gtceu:dusty_raw_pitchblende'), 10, 20)
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(10, 100))
.dimension('ad_astra:mars')
.duration(20 * 20)
.EUt(GTValues.VA[GTValues.IV])
.duration(20 * 120)
.EUt(GTValues.VA[GTValues.EV])
.circuit(3);
*/
//#endregion
//#region Ostrum Vapor
event.recipes.gtceu.ostrum_linear_accelerator('tfg:polyalkylene_lubricant')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000))
.inputFluids(Fluid.of('gtceu:ethylene', 1000))
.inputFluids(Fluid.of('gtceu:lubricant', 1000))
.outputFluids(Fluid.of('tfg:polyalkylene_lubricant', 1000))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500))
.dimension('ad_astra:mars')
.duration(20 * 150)
.EUt(GTValues.VA[GTValues.IV])
//.circuit(3);
event.recipes.gtceu.ostrum_linear_accelerator('tfg:caesium_137')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000))
.inputFluids(Fluid.of('gtceu:radon', 1000))
.itemInputs(Item.of('gtceu:caesium_dust', 64))
.itemOutputs(Item.of('#forge:dusts/caesium_137'))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 1500))
.dimension('ad_astra:mars')
.duration(20 * 150)
.EUt(GTValues.VA[GTValues.IV])
event.recipes.gtceu.ostrum_linear_accelerator('tfg:terrafirmaguard_pa6')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:ostrum_vapor', 1000))
.itemInputs(Item.of('tfg:polycaprolactam_fabric', 64))
.itemInputs(Item.of('tfg:refrigerant_pellet', 8))
.itemInputs(Item.of('gtceu:iodine_dust', 1))
.itemOutputs(Item.of('tfg:terrafirmaguard_pa6', 32))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100))
.dimension('ad_astra:mars')
.duration(20 * 120)
.EUt(GTValues.VA[GTValues.IV])
//#endregion
//#region Dense Ostrum Vapor
event.recipes.gtceu.ostrum_linear_accelerator('tfg:radioactive_effluent')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000))
.itemInputs(Item.of('#forge:dusts/caesium_137', 1))
.itemInputs(Item.of('gtceu:cobalt_dust', 8))
.outputFluids(Fluid.of('tfg:radioactive_effluent', 512))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(500, 1600))
.dimension('ad_astra:mars')
.duration(20 * 240)
.EUt(GTValues.VA[GTValues.LuV])
event.recipes.gtceu.ostrum_linear_accelerator('tfg:tbu_232_rod_ola')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000))
.inputFluids(Fluid.of('gtceu:radioactive_waste', 128000))
.inputFluids(Fluid.of('gtceu:tritiated_water', 41472))
.itemInputs('16x #forge:rods/long/thorium_230')
.itemInputs('16x #forge:rods/long/thorium_230')
.itemInputs('16x #forge:rods/long/thorium_230')
.itemInputs('16x #forge:rods/long/thorium_230')
.itemInputs('16x #forge:rods/long/thorium_230')
.itemInputs(Item.of('tfg:empty_rod_t2', 1))
.itemOutputs(Item.of('tfg:tbu_232_rod', 1))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 500))
.dimension('ad_astra:mars')
.duration(20 * 640)
.EUt(GTValues.VA[GTValues.IV])
event.recipes.gtceu.ostrum_linear_accelerator('tfg:dense_to_light')
.perTick(true)
.inputFluids(Fluid.of('gtceu:residual_radioactive_concoction', 1))
.perTick(false)
.inputFluids(Fluid.of('gtceu:dense_ostrum_vapor', 1000))
.outputFluids(Fluid.of('gtceu:lightweight_ostrum_vapor', 1000))
.input($HeatRecipeCapability.CAP, new $HeatIngredient(100, 100))
.dimension('ad_astra:mars')
.duration(20 * 240)
.EUt(GTValues.VA[GTValues.IV])
.circuit(4)
}

View file

@ -6,9 +6,9 @@
* @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material
*/
function getFluidRecipeEUt(material) {
// Special case for bis/black bronze because removing the blast property doesn't change the tier of
// Special case for bis bronze, black bronze, rose gold and sterling silver because removing the blast property doesn't change the tier of
// the extractor recipes retroactively
return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze
return material.hasProperty(PropertyKey.BLAST) && material !== GTMaterials.BismuthBronze && material !== GTMaterials.BlackBronze && material !== GTMaterials.RoseGold && material !== GTMaterials.SterlingSilver
? GTValues.VA[GTValues.MV]
: GTValues.VA[GTValues.LV];
}

View file

@ -33,9 +33,11 @@ function registerTFGNuclearComponentsRecipes(event) {
component("HEAT", "tfg:aes_insulation_frame", 1);
component("HEAT", "tfg:moderate_core_frame", 10);
component("HEAT", "tfg:impure_moderate_core_frame", 5);
/*
componentThermal('THERMAL', 'minecraft:sand', 1000, 25);
componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 50);
componentThermal('THERMAL', 'minecraft:bedrock', 9001, 1e5);
*/
//component("HEAT", "minecraft:bedrock", 1000);
//componentThermal('THERMAL', '#forge:sand', 1000, 1);
componentThermal('THERMAL', 'tfg:impure_moderate_core_frame', 2000, 10);
componentThermal('THERMAL', 'tfg:moderate_core_frame', 4000, 10);
//componentThermal('THERMAL', 'minecraft:bedrock', 9001, 10);
}

File diff suppressed because it is too large Load diff

View file

@ -8,6 +8,13 @@ const registerTFGItemTagsNuclear = (event) => {
event.add('deafission:fuels', 'tfg:plutonium_rod')
event.add('tfg:fission_rods', '#deafission:fuels')
let FISSION_ROD_TAG = 'tfg:fission_rods';
event.add(FISSION_ROD_TAG, 'tfg:tbu_232_rod');
event.add(FISSION_ROD_TAG, 'tfg:americium_241_rod');
event.add(FISSION_ROD_TAG, 'tfg:neptunium_237_rod');
event.add(FISSION_ROD_TAG, 'tfg:californium_252_rod');
}
const registerTFGBlockTagsNuclear = (event) => {
@ -39,14 +46,28 @@ const registerTFGBlockTagsNuclear = (event) => {
event.add(COMPONENTS_HB, 'minecraft:sand');
event.add(COMPONENTS_HB, 'tfg:impure_moderate_core_frame');
event.add(COMPONENTS_HB, 'tfg:moderate_core_frame');
event.add(COMPONENTS_HB, 'minecraft:bedrock'); // For Creative usage only
//#endregion
}
//#endregion
//#region Fluids
const registerTFGFluidTagsNuclear = (event) => {
// Fluid allowed for the SMR Hatch
let SMR_FLUIDS = 'tfg:smr_fluids';
event.add(SMR_FLUIDS, 'gtceu:lubricant');
event.add(SMR_FLUIDS, 'tfg:polyalkylene_lubricant');
event.add(SMR_FLUIDS, 'tfg:spent_ticl4_doped_supercritical_co2');
event.add(SMR_FLUIDS, 'tfg:ozone');
event.add(SMR_FLUIDS, 'tfg:cyclohex_diperoxide');
event.add(SMR_FLUIDS, 'tfg:booster_t3');
//#endregion
}

View file

@ -169,13 +169,13 @@ function registerTFGEarlyGasRecipes(event) {
.inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 4000))
.outputFluids(Fluid.of('tfg:reformate_gas', 8000))
.outputFluids(Fluid.of('tfg:cracker_off_gas', 1000))
.duration(20*30)
.duration(20*16)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.chemical_reactor('tfg:reformate_gas')
.inputFluids(Fluid.of('tfg:reformed_aromatic_feedstock', 2000), Fluid.of('gtceu:steam', 1000))
.outputFluids(Fluid.of('tfg:reformate_gas', 3000))
.duration(20*30)
.duration(20*16)
.EUt(GTValues.VA[GTValues.MV])
// Recycling
@ -190,11 +190,12 @@ function registerTFGEarlyGasRecipes(event) {
// Modify Recipe to balance new line
event.remove({ id: 'gtceu:extractor/charcoal_extraction' })
/*
event.recipes.gtceu.extractor('tfg:charcoal_extraction')
.itemInputs(Item.of('minecraft:charcoal'))
.outputFluids(Fluid.of('gtceu:wood_tar', 100))
.duration(20*6.4)
.EUt(GTValues.VA[GTValues.MV])
.EUt(GTValues.VA[GTValues.MV])*/
//#endregion
@ -235,7 +236,7 @@ function registerTFGEarlyGasRecipes(event) {
event.recipes.gtceu.gas_turbine('tfg:btx_fuel') // Gas Turbine
.inputFluids(Fluid.of('tfg:btx_fuel', 1))
.EUt(-(32))
.duration(20*2.6)
.duration(20*2.86)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
@ -246,7 +247,7 @@ function registerTFGEarlyGasRecipes(event) {
event.recipes.gtceu.chemical_reactor('tfg:electrolyze_syngas')
.notConsumable(Item.of('gtceu:copper_dust', 1))
.inputFluids(Fluid.of('tfg:syngas', 1000))
.outputFluids(Fluid.of('gtceu:methanol', 4000), Fluid.of('minecraft:water', 2000))
.outputFluids(Fluid.of('gtceu:methanol', 3000), Fluid.of('minecraft:water', 2000))
.duration(20*12)
.EUt(GTValues.VA[GTValues.MV])
@ -273,7 +274,7 @@ function registerTFGEarlyGasRecipes(event) {
.inputFluids(Fluid.of('gtceu:ammonia', 1000), Fluid.of('gtceu:ethanol', 1000))
.outputFluids(Fluid.of('tfg:tpaoh', 1000))
.duration(20*8)
.EUt(GTValues.VA[GTValues.EV])
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.chemical_reactor('tfg:zsm_5_gel')
.itemInputs(Item.of('#forge:dusts/sodium_aluminium'))
@ -303,6 +304,7 @@ function registerTFGEarlyGasRecipes(event) {
.itemInputs(Item.of('tfg:catalyser_pt_re_zsm'))
.inputFluids(Fluid.of('tfg:reformate_gas', 8000))
.inputFluids(Fluid.of('gtceu:propene', 2000))
.itemOutputs(Item.of('tfg:used_catalyser', 1))
.outputFluids(Fluid.of('tfg:crude_mixed_gas', 10000))
.duration(20*240)
.EUt(GTValues.VA[GTValues.LV])
@ -312,8 +314,7 @@ function registerTFGEarlyGasRecipes(event) {
.inputFluids(Fluid.of('gtceu:benzene', 20000))
.inputFluids(Fluid.of('gtceu:toluene', 6000))
.inputFluids(Fluid.of('gtceu:dimethylbenzene', 12000))
.itemOutputs(Item.of('tfg:used_catalyser', 1))
.outputFluids(Fluid.of('tfg:btx_fuel', 48000))
.outputFluids(Fluid.of('tfg:btx_fuel', 54000))
.duration(20*6)
.EUt(GTValues.VA[GTValues.IV])
.circuit(24)
@ -328,7 +329,7 @@ function registerTFGEarlyGasRecipes(event) {
event.recipes.gtceu.chemical_reactor('tfg:clean_powder')
.itemInputs(Item.of('tfg:catalyser_powder_dust', 1))
.inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 2000))
.inputFluids(Fluid.of('gtceu:hydrogen_peroxide', 200))
.itemOutputs(Item.of('tfg:clean_powder_dust', 1), Item.of('gtceu:sodium_dust', 1))
.duration(20*14)
.EUt(GTValues.VA[GTValues.MV])

View file

@ -0,0 +1,101 @@
function registerTFGPowerGenBalance(event) {
//#region Buff fuels
event.remove({ id: 'gtceu:combustion_generator/cetane_diesel' })
event.recipes.gtceu.combustion_generator('tfg:cetane_boosted_diesel')
.inputFluids(Fluid.of('gtceu:cetane_boosted_diesel', 1))
.duration(20*1.6)
.EUt(-32)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
//#endregion
//#region Nerf/Removed
/* COMMENT OUT UNTIL WE WANT TO ENABLE THE NERF
event.remove({ id: 'gtceu:gas_turbine/benzene' })
event.recipes.gtceu.gas_turbine('tfg:benzene')
.inputFluids(Fluid.of('gtceu:benzene', 1))
.duration(20*0.2)
.EUt(-32)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.remove({ id: 'gtceu:gas_turbine/nitrobenzene' })
event.recipes.gtceu.gas_turbine('tfg:nitrobenzene')
.inputFluids(Fluid.of('gtceu:nitrobenzene', 1))
.duration(20*0.5)
.EUt(-32)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
*/
// Remove Light fuel ability as a fuel
event.remove({ id: 'gtceu:combustion_generator/sulfuric_light_fuel' })
event.remove({ id: 'gtceu:combustion_generator/light_fuel' })
// Make Diesel available at ULV and balance power gen
event.remove({ id: 'gtceu:combustion_generator/diesel' })
event.recipes.gtceu.combustion_generator('tfg:diesel')
.inputFluids(Fluid.of('gtceu:diesel', 1))
.duration(20*0.6)
.EUt(-32)
.dimension('minecraft:overworld')
.dimension('minecraft:the_nether')
event.remove({ id: 'gtceu:mixer/diesel' })
event.recipes.gtceu.mixer('tfg:diesel')
.inputFluids(Fluid.of('gtceu:light_fuel', 5000), Fluid.of('gtceu:heavy_fuel', 1000))
.outputFluids(Fluid.of('gtceu:diesel', 6000))
.duration(20*1.6)
.EUt(GTValues.VA[GTValues.LV])
// Oil to Light Fuel
event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 250), [Fluid.of('gtceu:oil', 1000)])
.secondaryFluidOutput(0)
.processingTime(500)
.heated()
.id('tfg:vi/vacuumizing/light_fuel_from_oil')
event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:light_fuel', 50), [Fluid.of('gtceu:oil_light', 1000)])
.secondaryFluidOutput(0)
.processingTime(500)
.heated()
.id('tfg:vi/vacuumizing/light_fuel_from_light_oil')
// Raw Oil to Naphtha
event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:naphtha', 500), [Fluid.of('gtceu:oil_raw', 1000)])
.secondaryFluidOutput(0)
.processingTime(500)
.heated()
.id('tfg:vi/vacuumizing/light_fuel_from_raw_oil')
// Heavy oil to Heavy Fuel
event.recipes.vintageimprovements.vacuumizing(Fluid.of('gtceu:heavy_fuel', 750), [Fluid.of('gtceu:oil_heavy', 1000)])
.secondaryFluidOutput(0)
.processingTime(500)
.heated()
.id('tfg:vi/vacuumizing/heavy_fuel_from_heavy_oil')
// Switch HOG to require IV Energy Hatch
event.remove({ id: 'gtceu:large_chemical_reactor/high_octane_gasoline' })
event.recipes.gtceu.large_chemical_reactor('tfg:high_octane_gasoline')
.inputFluids(
Fluid.of('gtceu:gasoline', 20000),
Fluid.of('gtceu:octane', 2000),
Fluid.of('gtceu:nitrous_oxide', 2000),
Fluid.of('gtceu:toluene', 1000),
Fluid.of('gtceu:ethyl_tertbutyl_ether', 1000))
.outputFluids(Fluid.of('gtceu:high_octane_gasoline', 32000))
.duration(20*1.5)
.EUt(GTValues.VA[GTValues.LuV])
.circuit(24)
}

View file

@ -66,6 +66,11 @@ function registerTFGCompostRecipes(event) {
.duration(600)
.EUt(2)
event.smelting(
'1x tfc:groundcover/dead_grass',
'tfc:thatch'
).id('tfg:smelting/thatch_drying_furnace')
event.recipes.gtceu.fermenter('tfg:fertilizer_to_compost')
.itemInputs('4x gtceu:fertilizer')
.itemOutputs('tfc:compost')

View file

@ -67,6 +67,7 @@ const registerTFGRecipes = (event) => {
registerTFGNuclearComponentsRecipes(event)
registerTFGSolarRecipes(event)
registerTFGCoalRecipes(event)
registerTFGPowerGenBalance(event)
registerTFGZirconiumRecipes(event)
registerTFGBromineRecipes(event)

View file

@ -177,5 +177,52 @@ function registerTFGMiscellaneousRecipes(event) {
.duration(5*20)
.EUt(GTValues.VA[GTValues.LV])
.addMaterialInfo(true);
// Gregtech CEu Terminals Integration
//event.remove({ id : 'gtceuterminal:dismantler' })
event.shaped('1x gtceuterminal:dismantler', [
'ABA',
'CDC',
'FEF'
], {
A: 'gtceu:mv_sensor',
B: 'gtceu:mv_emitter',
C: '#gtceu:circuits/mv',
D: 'gtceu:computer_monitor_cover',
E: 'gtceu:mv_voltage_coil',
F: '#forge:plates/aluminium'
}).id(`tfg:shaped/dismantler`)
event.remove({ id : 'gtceuterminal:multi_structure_manager' })
event.shaped('1x gtceuterminal:multi_structure_manager', [
'ABA',
'CDC',
'FEF'
], {
A: 'gtceu:hv_sensor',
B: 'gtceu:hv_emitter',
C: '#gtceu:circuits/hv',
D: 'gtceu:terminal',
E: '#gtceu:batteries/hv',
F: '#forge:plates/stainless_steel'
}).id(`tfg:shaped/multi_structure_manager`)
event.remove({ id : 'gtceuterminal:schematic_interface' })
/* Broken for now as it can duplicate resources in the I/O Ports
event.shaped('1x gtceuterminal:schematic_interface', [
'ABA',
'CDC',
'FEF'
], {
A: 'gtceu:iv_sensor',
B: 'gtceu:iv_emitter',
C: '#gtceu:circuits/iv',
D: 'gtceu:terminal',
E: '#gtceu:batteries/iv',
F: '#forge:plates/tungsten_steel'
}).id(`tfg:shaped/schematic_interface`)
*/
}

View file

@ -88,6 +88,22 @@ function registerTFGRocketRecipes(event) {
.circuit(2)
.EUt(GTValues.VA[GTValues.HV])
.addMaterialInfo(true, true)
event.recipes.gtceu.assembler('ad_astra:assembler_tier_1_double_rocket')
.itemInputs(
ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t1'), 12),
'4x ad_astra:rocket_fin',
'1x ad_astra:steel_engine',
'1x ad_astra:rocket_nose_cone',
'24x #forge:insulation_t1',
'6x #gtceu:circuits/hv'
)
.inputFluids(Fluid.of('gtceu:silicon', 144 * 24))
.itemOutputs('tfg:tier_1_double_rocket')
.duration(1800)
.circuit(3)
.EUt(GTValues.VA[GTValues.HV])
.addMaterialInfo(true, true)
//#endregion
@ -185,6 +201,22 @@ function registerTFGRocketRecipes(event) {
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
.addMaterialInfo(true, true)
event.recipes.gtceu.assembler('ad_astra:tier_2_double_rocket')
.itemInputs(
ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t2'), 18),
'4x tfg:rocket_fin_t2',
'1x ad_astra:desh_engine',
'1x tfg:rocket_cone_t2',
'18x #forge:insulation_t2/roll',
'6x #gtceu:circuits/ev'
)
.inputFluids(Fluid.of('gtceu:titanium', 144 * 24))
.itemOutputs('tfg:tier_2_double_rocket')
.duration(2166)
.circuit(4)
.EUt(GTValues.VA[GTValues.EV])
.addMaterialInfo(true, true)
//#endregion
@ -278,6 +310,22 @@ function registerTFGRocketRecipes(event) {
.EUt(GTValues.VA[GTValues.IV])
.addMaterialInfo(true, true)
event.recipes.gtceu.assembler('ad_astra:tier_3_double_rocket')
.itemInputs(
'24x #forge:dense_plates/rocket_alloy_t3',
'4x tfg:rocket_fin_t3',
'1x ad_astra:ostrum_engine',
'2x ad_astra:ostrum_tank',
'1x tfg:rocket_cone_t3',
'12x #forge:insulation_t3/sheet'
)
.inputFluids(Fluid.of('gtceu:bromine', 1000 * 24))
.itemOutputs('tfg:tier_3_double_rocket')
.duration(2550)
.circuit(5)
.EUt(GTValues.VA[GTValues.IV])
.addMaterialInfo(true, true)
//#endregion
*/
}