From 0be85a7db0edf9b887dc0ef3599108749bec04dd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 21 Sep 2025 18:59:33 +0100 Subject: [PATCH] added ostrum to t2 space suit, added some recycling recipes for space stuff? --- kubejs/server_scripts/ad_astra/recipes.js | 45 ++++++++--- .../tfg/recipes.miscellaneous.js | 81 ++++++++++++------- .../vintage_improvements/recipes.js | 7 ++ 3 files changed, 95 insertions(+), 38 deletions(-) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 6d8be66ed..a184cb7bc 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -24,13 +24,14 @@ const registerAdAstraRecipes = (event) => { event.recipes.gtceu.assembler('tfg:rocket_nose_cone_t1') .itemInputs( 'gtceu:hv_emitter', - 'gtceu:dense_rocket_alloy_t1_plate', - '3x gtceu:double_stainless_steel_plate') + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t1'), 1), + ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.StainlessSteel, 3)) .inputFluids(Fluid.of('gtceu:polyethylene', 144 * 16)) .itemOutputs('ad_astra:rocket_nose_cone') .duration(1200) .circuit(2) .EUt(480) + .addMaterialInfo(true, true) event.recipes.gtceu.pyrolyse_oven('tfg:pyrolyse_vitrified_asbestos_dust') @@ -63,29 +64,35 @@ const registerAdAstraRecipes = (event) => { .EUt(120) event.recipes.gtceu.assembler(`tfg:rocket_fin_t1`) - .itemInputs('#forge:plates/rocket_alloy_t1', '#forge:double_plates/stainless_steel') + .itemInputs( + ChemicalHelper.get(TagPrefix.plate, TFGHelpers.getMaterial('rocket_alloy_t1'), 1), + ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.StainlessSteel, 1) + ) .itemOutputs('ad_astra:rocket_fin') .duration(150) .circuit(2) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:rocket_steel_engine') .itemInputs( - '2x #forge:double_plates/stainless_steel', + ChemicalHelper.get(TagPrefix.plateDouble, GTMaterials.StainlessSteel, 2), '2x #gtceu:circuits/hv', 'gtceu:hv_electric_pump', '2x gtceu:power_thruster', - '#forge:rotors/stainless_steel') + ChemicalHelper.get(TagPrefix.rotor, GTMaterials.StainlessSteel, 1) + ) .inputFluids(Fluid.of('gtceu:blue_steel', 144 * 8)) .itemOutputs('ad_astra:steel_engine') .duration(600) .circuit(2) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) event.recipes.gtceu.assembler('ad_astra:assembler_tier_1_rocket') .itemInputs( - '8x #forge:dense_plates/rocket_alloy_t1', + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t1'), 8), '4x ad_astra:rocket_fin', '1x ad_astra:steel_engine', '1x ad_astra:rocket_nose_cone', @@ -96,6 +103,7 @@ const registerAdAstraRecipes = (event) => { .duration(1200) .circuit(2) .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) //#endregion @@ -134,6 +142,7 @@ const registerAdAstraRecipes = (event) => { .duration(1440) .circuit(3) .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true) event.recipes.gtceu.assembler('tfg:rocket_desh_engine') @@ -289,7 +298,8 @@ const registerAdAstraRecipes = (event) => { event.recipes.gtceu.assembler('ad_astra:netherite_space_helmet') .itemInputs( 'ad_astra:space_helmet', - '3x #forge:plates/tungsten_steel', + '2x #forge:plates/tungsten_steel', + '1x #forge:plates/ostrum', '3x tfg:better_space_suit_fabric', '5x gtceu:laminated_glass' ) @@ -310,7 +320,12 @@ const registerAdAstraRecipes = (event) => { .id('tfg:empty_space_suit') event.recipes.gtceu.assembler('ad_astra:netherite_space_suit') - .itemInputs('ad_astra:space_suit', '5x #forge:plates/tungsten_steel','5x tfg:better_space_suit_fabric') + .itemInputs( + 'ad_astra:space_suit', + '3x #forge:plates/tungsten_steel', + '2x #forge:plates/ostrum', + '5x tfg:better_space_suit_fabric' + ) .itemOutputs('ad_astra:netherite_space_suit') .duration(400) .EUt(GTValues.VA[GTValues.IV]) @@ -328,7 +343,12 @@ const registerAdAstraRecipes = (event) => { }).id('tfg:space_pants') event.recipes.gtceu.assembler('ad_astra:netherite_space_pants') - .itemInputs('ad_astra:space_pants', '4x #forge:plates/tungsten_steel', '4x tfg:better_space_suit_fabric') + .itemInputs( + 'ad_astra:space_pants', + '2x #forge:plates/tungsten_steel', + '2x #forge:plates/ostrum', + '4x tfg:better_space_suit_fabric' + ) .itemOutputs('ad_astra:netherite_space_pants') .duration(400) .EUt(GTValues.VA[GTValues.IV]) @@ -342,7 +362,12 @@ const registerAdAstraRecipes = (event) => { }).id('tfg:space_boots') event.recipes.gtceu.assembler('ad_astra:netherite_space_boots') - .itemInputs('ad_astra:space_boots', '2x #forge:plates/tungsten_steel', '2x tfg:better_space_suit_fabric') + .itemInputs( + 'ad_astra:space_boots', + '1x #forge:plates/tungsten_steel', + '1x #forge:plates/ostrum', + '2x tfg:better_space_suit_fabric' + ) .itemOutputs('ad_astra:netherite_space_boots') .duration(400) .EUt(GTValues.VA[GTValues.IV]) diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 4405db8dc..4dcec0409 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -705,16 +705,16 @@ function registerTFGMiscellaneousRecipes(event) { // Have to redo all these because .replaceInput doesn't work for some reason!! - event.shaped('gtceu:mv_field_generator', [ + event.recipes.gtceu.shaped('gtceu:mv_field_generator', [ 'ABA', 'CDC', 'ABA' ], { - A: '#forge:quadruple_wires/magnesium_diboride', - B: '#forge:plates/aluminium', + A: ChemicalHelper.get(TagPrefix.wireGtQuadruple, GTMaterials.MagnesiumDiboride, 1), + B: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Aluminium, 1), C: '#gtceu:circuits/mv', D: 'tfg:vitrified_pearl' - }).id('gtceu:shaped/field_generator_mv') + }).addMaterialInfo().id('gtceu:shaped/field_generator_mv') event.recipes.gtceu.assembler('field_generator_mv') .itemInputs('tfg:vitrified_pearl', '2x #forge:plates/aluminium', '2x #gtceu:circuits/mv', '4x #forge:quadruple_wires/magnesium_diboride') @@ -722,16 +722,16 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(30) - event.shaped('gtceu:hv_emitter', [ + event.recipes.gtceu.shaped('gtceu:hv_emitter', [ 'ABC', 'BDB', 'CBA' ], { - A: '#forge:single_cables/gold', - B: '#forge:rods/chromium', + A: ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials.Gold, 1), + B: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Chromium, 1), C: '#gtceu:circuits/hv', D: 'tfg:vitrified_pearl' - }).id('gtceu:shaped/emitter_hv') + }).addMaterialInfo().id('gtceu:shaped/emitter_hv') event.recipes.gtceu.assembler('emitter_hv') .itemInputs('tfg:vitrified_pearl', '4x #forge:rods/chromium', '2x #gtceu:circuits/hv', '2x #forge:single_cables/gold') @@ -740,16 +740,16 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(30) - event.shaped('gtceu:hv_sensor', [ + event.recipes.gtceu.shaped('gtceu:hv_sensor', [ 'A B', 'AC ', 'DAA' ], { - A: '#forge:plates/stainless_steel', + A: ChemicalHelper.get(TagPrefix.plate, GTMaterials.StainlessSteel, 1), B: 'tfg:vitrified_pearl', - C: '#forge:rods/chromium', + C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Chromium, 1), D: '#gtceu:circuits/hv', - }).id('gtceu:shaped/sensor_hv') + }).addMaterialInfo().id('gtceu:shaped/sensor_hv') event.recipes.gtceu.assembler('sensor_hv') .itemInputs('tfg:vitrified_pearl', '#forge:rods/chromium', '#gtceu:circuits/hv', '4x #forge:plates/stainless_steel') @@ -758,16 +758,16 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(30) //Cryo Pearl replacements - event.shaped('gtceu:ev_emitter', [ + event.recipes.gtceu.shaped('gtceu:ev_emitter', [ 'ABC', 'BDB', 'CBA' ], { - A: '#forge:single_cables/aluminium', - B: '#forge:rods/platinum', + A: ChemicalHelper.get(TagPrefix.cableGtSingle, GTMaterials.Aluminium, 1), + B: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Platinum, 1), C: '#gtceu:circuits/ev', D: 'tfg:cryo_fluix_pearl' - }).id('gtceu:shaped/emitter_ev') + }).addMaterialInfo().id('gtceu:shaped/emitter_ev') event.recipes.gtceu.assembler('emitter_ev') .itemInputs('tfg:cryo_fluix_pearl', '4x #forge:rods/platinum', '2x #gtceu:circuits/ev', '2x #forge:single_cables/aluminium') @@ -776,16 +776,16 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(30) - event.shaped('gtceu:ev_sensor', [ + event.recipes.gtceu.shaped('gtceu:ev_sensor', [ 'A B', 'AC ', 'DAA' ], { - A: '#forge:plates/titanium', + A: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Titanium, 1), B: 'tfg:cryo_fluix_pearl', - C: '#forge:rods/platinum', + C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Platinum, 1), D: '#gtceu:circuits/ev', - }).id('gtceu:shaped/sensor_ev') + }).addMaterialInfo().id('gtceu:shaped/sensor_ev') event.recipes.gtceu.assembler('sensor_ev') .itemInputs('tfg:cryo_fluix_pearl', '#forge:rods/platinum', '#gtceu:circuits/ev', '4x #forge:plates/titanium') @@ -794,16 +794,16 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(30) //quantum eye IV replacements - event.shaped('gtceu:iv_emitter', [ + event.recipes.gtceu.shaped('gtceu:iv_emitter', [ 'ABC', 'BDB', 'CBA' ], { - A: '#forge:single_cables/tungsten', - B: '#forge:rods/iridium', + A: ChemicalHelper.get(TagPrefix.cableGtSingle, GTMaterials.Tungsten, 1), + B: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Iridium, 1), C: '#gtceu:circuits/iv', D: 'gtceu:quantum_eye' - }).id('gtceu:shaped/emitter_iv') + }).addMaterialInfo().id('gtceu:shaped/emitter_iv') event.recipes.gtceu.assembler('emitter_iv') .itemInputs('gtceu:quantum_eye', '4x #forge:rods/iridium', '2x #gtceu:circuits/iv', '2x #forge:single_cables/tungsten') @@ -812,16 +812,16 @@ function registerTFGMiscellaneousRecipes(event) { .duration(100) .EUt(30) - event.shaped('gtceu:iv_sensor', [ + event.recipes.gtceu.shaped('gtceu:iv_sensor', [ 'A B', 'AC ', 'DAA' ], { - A: '#forge:plates/tungsten_steel', + A: ChemicalHelper.get(TagPrefix.plate, GTMaterials.TungstenSteel, 1), B: 'gtceu:quantum_eye', - C: '#forge:rods/iridium', + C: ChemicalHelper.get(TagPrefix.rod, GTMaterials.Iridium, 1), D: '#gtceu:circuits/iv', - }).id('gtceu:shaped/sensor_iv') + }).addMaterialInfo().id('gtceu:shaped/sensor_iv') event.recipes.gtceu.assembler('sensor_iv') .itemInputs('gtceu:quantum_eye', '#forge:rods/iridium', '#gtceu:circuits/iv', '4x #forge:plates/tungsten_steel') @@ -1006,6 +1006,31 @@ function registerTFGMiscellaneousRecipes(event) { .blastFurnaceTemp(3400) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.tfc.damage_inputs_shapeless_crafting( + event.shapeless('8x tfc:wool_yarn', [ + 'tfc:spindle', + 'tfg:glacian_wool' + ]).id('tfg:shapeless/glacian_wool_to_yarn')) + + event.recipes.gtceu.wiremill('tfg:glacian_wool_yarn') + .itemInputs('tfg:glacian_wool') + .itemOutputs('8x tfc:wool_yarn') + .duration(100) + .EUt(4) + + event.recipes.tfc.damage_inputs_shapeless_crafting( + event.shapeless('4x tfg:fletching', [ + 'tfg:wraptor_wool', + '#forge:tools/knives' + ]).id('tfg:shapeless/wraptor_feather_fletching')) + + event.recipes.gtceu.assembler('tfg:assembler/wraptor_feather_fletching') + .itemInputs('1x tfg:wraptor_wool') + .itemOutputs('4x tfg:fletching') + .duration(20) + .circuit(4) + .EUt(GTValues.VA[GTValues.ULV]) + //endregion diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 2d06b3c49..049221778 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -677,6 +677,13 @@ function registerVintageImprovementsRecipes(event) { processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/coiling/wool_yarn`) + event.custom({ + type: 'vintageimprovements:coiling', + ingredients: [{ item: 'tfg:glacian_wool' }], + results: [{ item: 'tfc:wool_yarn', count: 8 }], + processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/coiling/glacian_wool_yarn`) + event.custom({ type: 'vintageimprovements:coiling', ingredients: [{ item: 'minecraft:phantom_membrane' }],