From f2b15b18ed482048619065511996694c69ee248b Mon Sep 17 00:00:00 2001 From: TomPlop Date: Wed, 29 Oct 2025 18:44:32 -0400 Subject: [PATCH] Fixes for 0.11.6 (#2123) * Casings and nerf apt * Change Rotor Holder recipes * nerf refrigerant pellet duration --- kubejs/server_scripts/gregtech/recipes.js | 49 ++++++++++++- kubejs/server_scripts/tfg/recipes.nuclear.js | 2 +- kubejs/startup_scripts/tfg/blocks.js | 74 ++++++++------------ 3 files changed, 77 insertions(+), 48 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index bcbd6d6c2..ea5991918 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1620,6 +1620,51 @@ const registerGTCEURecipes = (event) => { .duration(20 * 24) .EUt(GTValues.VA[GTValues.HV]) + // Modify Rotor Holder to require an Assembler + + event.remove({ id: 'gtceu:shaped/rotor_holder_hv' }) + event.remove({ id: 'gtceu:shaped/rotor_holder_ev' }) + event.remove({ id: 'gtceu:shaped/rotor_holder_iv' }) + event.remove({ id: 'gtceu:shaped/rotor_holder_luv' }) + event.remove({ id: 'gtceu:shaped/rotor_holder_zpm' }) + event.remove({ id: 'gtceu:shaped/rotor_holder_uv' }) + + event.recipes.gtceu.assembler('tfg:rotor_holder_hv') + .itemInputs('4x #forge:gears/black_steel', '4x #forge:small_gears/stainless_steel', 'gtceu:hv_machine_hull') + .itemOutputs('gtceu:hv_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.HV]) + + event.recipes.gtceu.assembler('tfg:rotor_holder_ev') + .itemInputs('4x #forge:gears/ultimet', '4x #forge:small_gears/titanium', 'gtceu:ev_machine_hull') + .itemOutputs('gtceu:ev_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.assembler('tfg:rotor_holder_iv') + .itemInputs('4x #forge:gears/hssg', '4x #forge:small_gears/tungsten_steel', 'gtceu:iv_machine_hull') + .itemOutputs('gtceu:iv_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.IV]) + + event.recipes.gtceu.assembler('tfg:rotor_holder_luv') + .itemInputs('4x #forge:gears/ruthenium', '4x #forge:small_gears/rhodium_plated_palladium', 'gtceu:luv_machine_hull') + .itemOutputs('gtceu:luv_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.LuV]) + + event.recipes.gtceu.assembler('tfg:rotor_holder_zpm') + .itemInputs('4x #forge:gears/trinium', '4x #forge:small_gears/naquadah_alloy', 'gtceu:zpm_machine_hull') + .itemOutputs('gtceu:zpm_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.ZPM]) + + event.recipes.gtceu.assembler('tfg:rotor_holder_uv') + .itemInputs('4x #forge:gears/tritanium', '4x #forge:small_gears/darmstadtium', 'gtceu:uv_machine_hull') + .itemOutputs('gtceu:uv_rotor_holder') + .duration(20 * 6) + .EUt(GTValues.VA[GTValues.UV]) + //# Circuit Board event.replaceInput({ id: 'gtceu:assembler/phenolic_board' }, '#tfg:wood_dusts', 'tfg:high_density_treated_fiberboard') @@ -1674,14 +1719,14 @@ const registerGTCEURecipes = (event) => { .outputFluids(Fluid.of('gtceu:hydrogen', 500)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) - .duration(20*120) + .duration(20*90) .EUt(GTValues.VHA[GTValues.HV]) event.recipes.gtceu.distillery('tfg:ammonium_tungstate_to_apt') .itemInputs(Item.of('tfg:ammonium_tungstate_dust', 1)) .itemOutputs(Item.of('tfg:apt_gem', 1)) .outputFluids(Fluid.of('gtceu:hydrogen', 500)) - .duration(20*120) + .duration(20*90) .EUt(GTValues.VHA[GTValues.HV]) event.recipes.gtceu.pyrolyse_oven('tfg:apt') diff --git a/kubejs/server_scripts/tfg/recipes.nuclear.js b/kubejs/server_scripts/tfg/recipes.nuclear.js index 55a17d523..492920b91 100644 --- a/kubejs/server_scripts/tfg/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/recipes.nuclear.js @@ -344,7 +344,7 @@ function registerTFGNuclearRecipes(event) { .inputFluids(Fluid.of('gtceu:radon', 5)) .itemOutputs(Item.of('tfg:refrigerant_pellet', 1)) .EUt(GTValues.VA[GTValues.EV]) - .duration(20*17) + .duration(20*9) // Graphite Moderator Line diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 5c2e7cc8b..c24c4b1b7 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -13,8 +13,7 @@ const registerTFGBlocks = (event) => { .soundType('metal') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_black') .speedFactor(1.1) .activeOffset(3.5, 2, 3.5) @@ -34,8 +33,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') }) @@ -45,8 +43,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') event.create('tfg:casings/machine_casing_vacuum_engine_intake', 'gtceu:active') @@ -54,8 +51,7 @@ const registerTFGBlocks = (event) => { .translationKey('block.tfg.casings.machine_casing_vacuum_engine_intake') .soundType('metal') .resistance(6).hardness(5) - .tagBlock('mineable/pickaxe') - .tagBlock('forge:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .requiresTool(true) .mapColor('color_light_gray') @@ -65,8 +61,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_red') event.create('tfg:casings/machine_casing_bioculture_glass') @@ -75,8 +70,7 @@ const registerTFGBlocks = (event) => { .soundType('glass') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_orange') .defaultTranslucent() @@ -85,8 +79,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') .activeOffset(1.6, 2, 1.6) .activeVelocity(0, 0, 0) @@ -100,8 +93,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') event.create('tfg:casings/machine_casing_ultraviolet', 'gtceu:active') @@ -109,8 +101,7 @@ const registerTFGBlocks = (event) => { .soundType('glass') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') event.create('tfg:casings/heat_pipe_casing') @@ -119,16 +110,14 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_black') event.create('tfg:sample_rack', 'tfg:active_cardinal') .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') .notSolid() .renderType('cutout') @@ -138,8 +127,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_light_gray') .notSolid() .renderType('cutout') @@ -149,8 +137,7 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_brown') //#endregion @@ -160,7 +147,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:polished_titanium_concrete') @@ -168,7 +155,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/polished_titanium_concrete') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:titanium_concrete_tile') @@ -176,7 +163,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete_tile') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:titanium_concrete_tile_small') @@ -184,7 +171,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete_tile_small') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:titanium_concrete_bricks') @@ -192,7 +179,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete_bricks') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:titanium_concrete_bricks_small') @@ -200,7 +187,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete_bricks_small') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') event.create('tfg:titanium_concrete_bricks_square') @@ -208,7 +195,7 @@ const registerTFGBlocks = (event) => { .model('tfg:block/concrete/titanium_concrete_bricks_square') .soundType('stone') .mapColor('stone') - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .tagBoth('tfg:titanium_concrete') // #region insulation @@ -216,42 +203,39 @@ const registerTFGBlocks = (event) => { .soundType('copper') .hardness(4) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + event.create('tfg:aes_insulation_frame') .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') event.create('tfg:moderate_core_frame') .soundType('copper') .hardness(4) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + event.create('tfg:impure_moderate_core_frame') .soundType('copper') .hardness(5) .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') // Unfinished Insulation event.create('tfg:moderate_core') .soundType('ancient_debris') .hardness(7) .resistance(8) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .model('tfg:block/fission/moderate_core') + event.create('tfg:impure_moderate_core') .soundType('ancient_debris') .hardness(7) .resistance(8) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') .model('tfg:block/fission/impure_moderate_core') // #region Decorative vases