diff --git a/kubejs/server_scripts/railways/gpedia_locometal_integration.js b/kubejs/server_scripts/railways/gpedia_locometal_integration.js index 4548a0a31..6ccac5a9f 100644 --- a/kubejs/server_scripts/railways/gpedia_locometal_integration.js +++ b/kubejs/server_scripts/railways/gpedia_locometal_integration.js @@ -30,6 +30,7 @@ const railwaysLocometalIntegration = (event) => { .itemOutputs(Item.of(`railways:${locometal}`)) .duration(20) .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) } event.recipes.create.item_application(`railways:iron_wrapped_locometal`, [`#railways:palettes/cycle_groups/base`, '#forge:plates/wrought_iron']); @@ -41,19 +42,50 @@ const railwaysLocometalIntegration = (event) => { .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:brass_wrapped_locometal`) .duration(20) - .EUt(24); + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`gpedia:undying/copper_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/copper_wrapped_slashed') .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:copper_wrapped_locometal`) .duration(20) - .EUt(24); + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`gpedia:undying/iron_wrapped_locometal`) .itemInputs('#railways:palettes/dye_groups/iron_wrapped_slashed') .inputFluids(Fluid.of(`gtceu:chlorine`, 18)) .itemOutputs(`railways:iron_wrapped_locometal`) .duration(20) .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath('tfg:undying/boiler') + .itemInputs('#railways:palettes/dye_groups/boiler') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs(`railways:locometal_boiler`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:undying/brass_wrapped_boiler`) + .itemInputs('#railways:palettes/dye_groups/brass_wrapped_boiler') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs(`railways:brass_wrapped_locometal_boiler`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:undying/copper_wrapped_boiler`) + .itemInputs('#railways:palettes/dye_groups/copper_wrapped_boiler') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs(`railways:copper_wrapped_locometal_boiler`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:undying/iron_wrapped_boiler`) + .itemInputs('#railways:palettes/dye_groups/iron_wrapped_boiler') + .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) + .itemOutputs(`railways:iron_wrapped_locometal_boiler`) + .duration(20) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES) global.MINECRAFT_DYE_NAMES.forEach(dye => { for (var locometal in locometalBase) { @@ -62,35 +94,93 @@ const railwaysLocometalIntegration = (event) => { .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(Item.of(`railways:${dye}_${locometal}`)) .duration(20) - .EUt(24); - event.shapeless( - Item.of(`railways:${dye}_${locometal}`, 8), - [ - Item.of(locometalDyeGroups[`${locometal}`], 8), - `1x #forge:dyes/${dye}_dye` - ] - ) + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); }; event.recipes.create.item_application(`railways:${dye}_iron_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/wrought_iron']); event.recipes.create.item_application(`railways:${dye}_copper_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/copper']); event.recipes.create.item_application(`railways:${dye}_brass_wrapped_locometal`, [`#railways:palettes/cycle_groups/${dye}`, '#forge:plates/brass']); + event.recipes.gtceu.chemical_bath(`gpedia:brass_locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/brass_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_brass_wrapped_locometal`) .duration(20) - .EUt(24); + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`gpedia:copper_locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/copper_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_copper_wrapped_locometal`) .duration(20) - .EUt(24); + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); event.recipes.gtceu.chemical_bath(`gpedia:locometal_bathing/${dye}`) .itemInputs('#railways:palettes/dye_groups/iron_wrapped_slashed') .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) .itemOutputs(`railways:${dye}_iron_wrapped_locometal`) .duration(20) - .EUt(24); + .EUt(24) + .category(GTRecipeCategories.CHEM_DYES); + event.recipes.gtceu.chemical_bath(`tfg:railways/locometal_boiler/color/${dye}`) + .itemInputs('#railways:palettes/dye_groups/boiler') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) + .itemOutputs(`railways:${dye}_locometal_boiler`) + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:railways/brass_wrapped_locometal_boiler/color/${dye}`) + .itemInputs('#railways:palettes/dye_groups/brass_wrapped_boiler') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) + .itemOutputs(`railways:${dye}_brass_wrapped_locometal_boiler`) + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:railways/copper_wrapped_locometal_boiler/color/${dye}`) + .itemInputs('#railways:palettes/dye_groups/copper_wrapped_boiler') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) + .itemOutputs(`railways:${dye}_copper_wrapped_locometal_boiler`) + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) + event.recipes.gtceu.chemical_bath(`tfg:railways/iron_wrapped_locometal_boiler/color/${dye}`) + .itemInputs('#railways:palettes/dye_groups/iron_wrapped_boiler') + .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) + .itemOutputs(`railways:${dye}_iron_wrapped_locometal_boiler`) + .duration(300) + .EUt(4) + .category(GTRecipeCategories.CHEM_DYES) }) + + // Locometal Boiler + event.recipes.gtceu.assembler(`tfg:railways/locometal_boiler`) + .itemInputs('#railways:palettes/cycle_groups/base', `create:fluid_tank`) + .circuit(1) + .itemOutputs(`railways:locometal_boiler`) + .duration(200) + .EUt(28) + + // Brass Wrapped Locometal Boiler + event.recipes.gtceu.assembler(`tfg:railways/brass_wrapped_locometal_boiler`) + .itemInputs(`railways:brass_wrapped_locometal`, `create:fluid_tank`) + .circuit(1) + .itemOutputs(`railways:brass_wrapped_locometal_boiler`) + .duration(200) + .EUt(28) + + // Copper Wrapped Locometal Boiler + event.recipes.gtceu.assembler(`tfg:railways/copper_wrapped_locometal_boiler`) + .itemInputs(`railways:copper_wrapped_locometal`, `create:fluid_tank`) + .circuit(1) + .itemOutputs(`railways:copper_wrapped_locometal_boiler`) + .duration(200) + .EUt(28) + + // Iron Wrapped Locometal Boiler + event.recipes.gtceu.assembler(`tfg:railways/iron_wrapped_locometal_boiler`) + .itemInputs(`railways:iron_wrapped_locometal`, `create:fluid_tank`) + .circuit(1) + .itemOutputs(`railways:iron_wrapped_locometal_boiler`) + .duration(200) + .EUt(28) } \ No newline at end of file diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index ba3035089..55924e895 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -47,6 +47,44 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(28) + //#region Couplers and Buffers + event.recipes.gtceu.assembler(`tfg:railways/screwlink_coupler`) + .itemInputs(`minecraft:tripwire_hook`, `#forge:plates/steel`, '#forge:screws/steel') + .circuit(1) + .itemOutputs(`railways:screwlink_coupler`) + .duration(200) + .EUt(28) + + event.recipes.gtceu.assembler(`tfg:railways/copycat_headstock_screwlink_coupler`) + .itemInputs(`railways:screwlink_coupler`, `create:copycat_panel`) + .circuit(1) + .itemOutputs(`railways:copycat_headstock_screwlink_coupler`) + .duration(200) + .EUt(28) + + event.recipes.gtceu.assembler(`tfg:railways/buffer`) + .itemInputs(`6x #forge:rods/long/steel`, `2x railways:small_buffer`) + .circuit(1) + .itemOutputs(`railways:buffer`) + .duration(200) + .EUt(28) + + event.recipes.gtceu.assembler(`tfg:railways/small_buffer`) + .itemInputs(`railways:screwlink_coupler`, `#forge:ingots/steel`) + .circuit(1) + .itemOutputs(`railways:small_buffer`) + .duration(200) + .EUt(28) + + event.recipes.gtceu.assembler(`tfg:railways/big_buffer`) + .itemInputs(`railways:small_buffer`, `#forge:ingots/steel`) + .circuit(1) + .itemOutputs(`railways:big_buffer`) + .duration(200) + .EUt(28) + + //#endregion + // Переключатель пути поезда из андезита event.shaped('railways:track_switch_andesite', [ 'BAB',